diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-17 21:20:28 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-10 11:44:32 -0500 |
| commit | 8faa04c316fd2318708f2fcfaeea402615aafef9 (patch) | |
| tree | c1a32b783476764d5d66492ad18acbe2276b2601 | |
| parent | 2fb54e94c3091a69c59fdd1b68b849b28188e329 (diff) | |
| download | guix-8faa04c316fd2318708f2fcfaeea402615aafef9.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/glib.scm | 15 |
1 files 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 |