From 8faa04c316fd2318708f2fcfaeea402615aafef9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 17 Dec 2021 21:20:28 -0500 Subject: gnu: glib: Fix cross-compilation. Fixes . Reported by L p R n d n . 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(-) (limited to 'gnu/packages/glib.scm') 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 -- cgit 1.4.1