futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gobject-introspection: Fix inputs when cross-compiling.

Browse Source 
* gnu/packages/glib.scm
  (gobject-introspection)[native-inputs]: Add 'bison' and 'flex'
  when cross-compiling.
  (gobject-introspection)[inputs]: Use 'python' instead of 'python-wrapper'
  when cross-compiling.  Remove 'bison', 'flex' when cross-compiling.
This commit is contained in:
Maxime Devos 2021-08-24 12:30:42 +02:00 committed by Mathieu Othacehe
parent c185e5ad67
commit 4ab2c0d600
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/glib.scm
View File

@ -438,11 +438,19 @@ functions for strings and common data structures.")
#t))))) #t)))))
(native-inputs (native-inputs
`(("glib" ,glib "bin") `(("glib" ,glib "bin")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
;; TODO(core-updates): Unconditionally place "flex" and "bison"
;; in 'native-inputs'.
,@(if (%current-target-system)
`(("bison" ,bison)
("flex" ,flex))
'())))
(inputs (inputs
`(("bison" ,bison) `(,@(if (%current-target-system)
("flex" ,flex) `(("python" ,python))
("python" ,python-wrapper) `(("bison" ,bison)
("flex" ,flex)
("python" ,python-wrapper)))
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (propagated-inputs
`(("glib" ,glib) `(("glib" ,glib)