guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

19/145: gnu: gobject-introspection: Unconditionally use flex and bison.


From: guix-commits
Subject: 19/145: gnu: gobject-introspection: Unconditionally use flex and bison.
Date: Mon, 10 Jan 2022 11:44:02 -0500 (EST)

apteryx pushed a commit to branch version-1.4.0
in repository guix.

commit 65006051a2d7569a424e031cb1ab9600a1ff9e33
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 16:06:16 2021 -0500

    gnu: gobject-introspection: Unconditionally use flex and bison.
    
    * gnu/packages/glib.scm (gobject-introspection): Delete trailing #t.
    [native-inputs]: Unconditionally use flex and bison.
---
 gnu/packages/glib.scm | 11 +++--------
 1 file 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]