diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-17 16:06:16 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-10 11:44:31 -0500 |
commit | a9d27c30dcc7550bdb067a7683b90d16075e53a7 (patch) | |
tree | ab88f809429fa56ceb8c2c8a1af7fd8016f14baa | |
parent | a400a6422755897aa18e0768f0b47a577ad729f1 (diff) | |
download | guix-a9d27c30dcc7550bdb067a7683b90d16075e53a7.tar.gz |
gnu: gobject-introspection: Unconditionally use flex and bison.
* gnu/packages/glib.scm (gobject-introspection): Delete trailing #t. [native-inputs]: Unconditionally use flex and bison.
-rw-r--r-- | gnu/packages/glib.scm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1bd1d6c138..4868db832d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -467,8 +467,7 @@ be used when cross-compiling." (lambda _ (substitute* "tools/g-ir-tool-template.in" (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t)) + (string-append "#!" (which "python3")))))) #$@(if (%current-target-system) ;; Meson gives python extensions an incorrect name, see ;; <https://github.com/mesonbuild/meson/issues/7049>. @@ -482,12 +481,8 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) |