mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 23:36:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glib: Fix cross-compilation.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2021-12-17 21:20:28 -05:00
parent 2fb54e94c3
commit 8faa04c316
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/glib.scm
View file

@ -212,12 +212,11 @@ (define glib
`(,(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 @@ (define-public glib-with-documentation
(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