diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-08-24 12:30:42 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-20 11:15:05 +0000 |
| commit | 4ab2c0d600851d3db6572f735ff7048ff3011a6b (patch) | |
| tree | 278998c2271d5afc41766fa7a2a8db6886310a13 /gnu | |
| parent | c185e5ad6720aa5196fec849e1145cc492f0ed27 (diff) | |
| download | guix-4ab2c0d600851d3db6572f735ff7048ff3011a6b.tar guix-4ab2c0d600851d3db6572f735ff7048ff3011a6b.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/glib.scm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 829ef32221..f2606a70af 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) |