guix-commits
[Top][All Lists]
Advanced

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

15/52: gobject-introspection: Fix inputs when cross-compiling.


From: guix-commits
Subject: 15/52: gobject-introspection: Fix inputs when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:30 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 4ab2c0d600851d3db6572f735ff7048ff3011a6b
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 12:30:42 2021 +0200

    gobject-introspection: Fix inputs when cross-compiling.
    
    * 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.
---
 gnu/packages/glib.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 829ef32..f2606a7 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -438,11 +438,19 @@ functions for strings and common data structures.")
              #t)))))
     (native-inputs
      `(("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
-     `(("bison" ,bison)
-       ("flex" ,flex)
-       ("python" ,python-wrapper)
+     `(,@(if (%current-target-system)
+             `(("python" ,python))
+             `(("bison" ,bison)
+               ("flex" ,flex)
+               ("python" ,python-wrapper)))
        ("zlib" ,zlib)))
     (propagated-inputs
      `(("glib" ,glib)



reply via email to

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