apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit e7613b136ded687787580e4f998dfa4ae1050891
Author: Maxim Cournoyer <[email protected]>
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 <[email protected]>.
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
