[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'nat
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'. |
Date: |
Fri, 18 Jun 2021 19:16:25 +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 244544ea6f..57e8282a89 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -251,10 +251,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 v3 core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts., (continued)
- [bug#49025] [PATCH v3 core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 12/37] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 15/37] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 28/37] fontconfig: Fix build error when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 26/37] bash: Fix cross-compilation build error., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 29/37] glib: Use a correct python in scripts when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 25/37] bash: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 32/37] tk: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 34/37] libelf: Use the cross-compiler when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'.,
Maxime Devos <=
- [bug#49025] [PATCH v3 core-updates 37/37] meson: Support cross-compilation., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 24/37] readline: Fix build error when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 35/37] opendht: Correct 'nettle' variable name in inputs., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v4 core-updates 00/36] Support cross-compilation with meson, Maxime Devos, 2021/06/19