[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling
From: |
guix-commits |
Subject: |
22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling. |
Date: |
Mon, 20 Sep 2021 07:19:32 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit c170e9b75fbda901aaf46d3b8e09975cb9b422bb
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 16:19:32 2021 +0200
gnu: iso-codes: Move inputs to native-inputs when cross-compiling.
* gnu/packages/iso-codes.scm
(iso-codes)[inputs]: Move "gettext", "perl" and "python" to ...
(iso-codes)[native-inputs]: ... here when cross-compiling.
---
gnu/packages/iso-codes.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index 637390d..b2cfd34 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -44,10 +44,19 @@
(base32
"1q6x9c5x4x0x4q11iygldsmxdyzhz1mb4n8im76glwsgqsqyjs80"))))
(build-system gnu-build-system)
+ ;; TODO(staging): Unconditionally move inputs to native-inputs.
+ (native-inputs
+ (if (%current-target-system)
+ `(("python" ,python-wrapper)
+ ("perl" ,perl)
+ ("gettext" ,gettext-minimal))
+ '()))
(inputs
- `(("gettext" ,gettext-minimal)
- ("perl" ,perl)
- ("python" ,python-wrapper)))
+ `(,@(if (%current-target-system)
+ '()
+ `(("gettext" ,gettext-minimal)
+ ("perl" ,perl)
+ ("python" ,python-wrapper)))))
(synopsis "Various ISO standards")
(description
"This package provides lists of various ISO standards (e.g. country,
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., (continued)
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 25/52: gnu: heimdal: Refer to cross-compiled bash., guix-commits, 2021/09/20
- 15/52: gobject-introspection: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 27/52: gnu: heimdal: Find tools when cross-compiling., guix-commits, 2021/09/20
- 32/52: gnu: json-glib: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 03/52: gnu: elogind: Fix cross-compilation., guix-commits, 2021/09/20
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 10/52: build-system/meson: Allow 'configure-flags' to be a G-exp., guix-commits, 2021/09/20
- 22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling.,
guix-commits <=
- 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling., guix-commits, 2021/09/20
- 26/52: gnu: heimdal: Use the cross-compiled bash in "su"., guix-commits, 2021/09/20
- 29/52: gnu: json-glib: Add missing 'bash-minimal' input., guix-commits, 2021/09/20
- 30/52: gnu: json-glib: Find docbook inputs when cross-compiling., guix-commits, 2021/09/20
- 31/52: gnu: json-glib: Don't build gtk documentation when cross-compiling., guix-commits, 2021/09/20
- 36/52: gnu: avahi: Use the cross-compiled bash., guix-commits, 2021/09/20
- 38/52: gnu: at-spi2-core: Find docbook when cross-compiling., guix-commits, 2021/09/20
- 44/52: gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 41/52: gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20