[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/142: gnu: glib: Fix cross-compilation.
From: |
guix-commits |
Subject: |
26/142: gnu: glib: Fix cross-compilation. |
Date: |
Mon, 10 Jan 2022 13:07:15 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 8faa04c316fd2318708f2fcfaeea402615aafef9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 21:20:28 2021 -0500
gnu: glib: Fix cross-compilation.
Fixes <https://issues.guix.gnu.org/52574>.
Reported by L p R n d n <guix@lprndn.info>.
Thanks to Maxime Devos for the suggested fix.
* gnu/packages/glib.scm (glib)[configure-flags]: Define as a G-expression.
(glib-with-documentation)[configure-flags]: Likewise.
---
gnu/packages/glib.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 4868db832d..ade4eb32aa 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -212,12 +212,11 @@ shared NFS home directories.")
`(,(this-package-native-input "python")
,(this-package-native-input "python-wrapper")))
'()))
- #:configure-flags (list "--default-library=both"
- "-Dman=false"
- "-Dselinux=disabled"
- (string-append "--bindir="
- (assoc-ref %outputs "bin")
- "/bin"))
+ #:configure-flags ,#~(list "--default-library=both"
+ "-Dman=false"
+ "-Dselinux=disabled"
+ (string-append "--bindir="
+ #$output:bin "/bin"))
#:phases
(modify-phases %standard-phases
;; Needed to pass the test phase on slower ARM and i686 machines.
@@ -365,8 +364,8 @@ functions for strings and common data structures.")
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:configure-flags flags ''())
- `(cons "-Dgtk_doc=true"
- (delete "-Dman=false" ,flags)))
+ #~(cons "-Dgtk_doc=true"
+ (delete "-Dman=false" #$flags)))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-docbook-xml
- 68/142: gnu: python-pylint: Update to 2.12.2., (continued)
- 68/142: gnu: python-pylint: Update to 2.12.2., guix-commits, 2022/01/10
- 83/142: gnu: python-beautifulsoup4: Update to 4.10.0., guix-commits, 2022/01/10
- 89/142: gnu: igraph: Update to 0.9.5., guix-commits, 2022/01/10
- 92/142: build-system/gnu: Make gzip files writable before resetting timestamps., guix-commits, 2022/01/10
- 93/142: gnu: python-biom-format: Remove obsolete phase., guix-commits, 2022/01/10
- 17/142: guix: lint: Fix comment per TODO., guix-commits, 2022/01/10
- 24/142: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 25/142: gnu: libproxy: Remove target condition from check phase., guix-commits, 2022/01/10
- 27/142: gnu: python-nose: Fix build., guix-commits, 2022/01/10
- 30/142: gnu: glibmm: Remove trailing #t., guix-commits, 2022/01/10
- 26/142: gnu: glib: Fix cross-compilation.,
guix-commits <=
- 34/142: gnu: eudev: Update to 3.2.11., guix-commits, 2022/01/10
- 41/142: gnu: gsettings-desktop-schemas: Add python to native inputs., guix-commits, 2022/01/10
- 46/142: gnu: libxkbcommon: Add python to native inputs., guix-commits, 2022/01/10
- 49/142: gnu: pangomm: Add python to native inputs., guix-commits, 2022/01/10
- 58/142: gnu: glade3: Add python to native inputs., guix-commits, 2022/01/10
- 55/142: gnu: python-msgpack: Update to 1.0.3., guix-commits, 2022/01/10
- 59/142: gnu: python-curio: Disable newly failing 'test_timeout' test., guix-commits, 2022/01/10
- 07/142: gnu: python-tomli: Update to 2.0.0., guix-commits, 2022/01/10
- 22/142: gnu: cairo: Use bash-minimal unconditionally., guix-commits, 2022/01/10
- 40/142: gnu: gnome-backgrounds: Update to 41.0., guix-commits, 2022/01/10