[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v6 20/22] glib: Look up "tzdata" in 'native-inputs',
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v6 20/22] glib: Look up "tzdata" in 'native-inputs', not 'inputs'. |
Date: |
Wed, 14 Jul 2021 13:13:05 +0200 |
Otherwise, "tzdata" won't be found when cross-compiling
and string-append will complain about types. Alternatively,
"tzdata" could be moved from 'native-inputs' to 'inputs'.
* gnu/packages/glib.scm (glib)[arguments]<#:phases>{pre-check}:
Look up "tzdata" in 'native-inputs', not 'inputs'.
---
gnu/packages/glib.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index e4ebed7e2c..01683df8c5 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -252,10 +252,11 @@ shared NFS home directories.")
(package-version python)))))
#t))
(add-before 'check 'pre-check
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
;; For tests/gdatetime.c.
(setenv "TZDIR"
- (string-append (assoc-ref inputs "tzdata")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "tzdata")
"/share/zoneinfo"))
;; Some tests want write access there.
(setenv "HOME" (getcwd))
--
2.32.0
- [bug#49025] [PATCH core-updates 00/37] Support cross-compilation with meson, (continued)
- [bug#49025] [PATCH v6 08/22] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 10/22] libgpg-error: Fix cross-compilation error., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 12/22] openssl: Remove trailing #t from phases., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 19/22] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 01/22] utils: Define 'target-linux?' predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 04/22] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 11/22] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 18/22] glib: Use a correct python in scripts when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 20/22] glib: Look up "tzdata" in 'native-inputs', not 'inputs'.,
Maxime Devos <=
- [bug#49025] [PATCH v6 07/22] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 06/22] net-base: Don't cross-compile., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 09/22] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 16/22] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 15/22] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 14/22] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 17/22] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 22/22] build-system/meson: Support cross-compilation., Maxime Devos, 2021/07/14