guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: gobject-introspection: Unconditionally use flex and bison.

Browse source 
* gnu/packages/glib.scm (gobject-introspection): Delete trailing #t.
[native-inputs]: Unconditionally use flex and bison.
This commit is contained in:
Maxim Cournoyer 2021-12-17 16:06:16 -05:00
parent a400a64227
commit a9d27c30dc
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/glib.scm
View file

@ -467,8 +467,7 @@ be used when cross-compiling."
(lambda _ (lambda _
(substitute* "tools/g-ir-tool-template.in" (substitute* "tools/g-ir-tool-template.in"
(("#!@PYTHON_CMD@") (("#!@PYTHON_CMD@")
(string-append "#!" (which "python3")))) (string-append "#!" (which "python3"))))))
#t))
#$@(if (%current-target-system) #$@(if (%current-target-system)
;; Meson gives python extensions an incorrect name, see ;; Meson gives python extensions an incorrect name, see
;; <https://github.com/mesonbuild/meson/issues/7049>. ;; <https://github.com/mesonbuild/meson/issues/7049>.
@ -482,12 +481,8 @@ be used when cross-compiling."
(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" ("bison" ,bison)
;; in 'native-inputs'. ("flex" ,flex)))
,@(if (%current-target-system)
`(("bison" ,bison)
("flex" ,flex))
'())))
(inputs (inputs
`(,@(if (%current-target-system) `(,@(if (%current-target-system)
`(("python" ,python)) `(("python" ,python))