[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/22: glib: Look up "tzdata" in 'native-inputs', not 'inputs'.
From: |
guix-commits |
Subject: |
20/22: glib: Look up "tzdata" in 'native-inputs', not 'inputs'. |
Date: |
Wed, 14 Jul 2021 13:20:53 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 5a88b8df00dfcfb3d145ca0fd30d9fd27af4af7d
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Jul 14 13:13:05 2021 +0200
glib: Look up "tzdata" in 'native-inputs', not 'inputs'.
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'.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
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 e4ebed7..01683df 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))
- branch core-updates updated (b4ccf3d -> 8456581), guix-commits, 2021/07/14
- 07/22: tzdata: Don't bother with cross-compiling., guix-commits, 2021/07/14
- 09/22: libgpg-error: Prevent silent miscompilation some systems., guix-commits, 2021/07/14
- 05/22: packages: Define this-package-input and this-package-native-input., guix-commits, 2021/07/14
- 02/22: utils: Define 'target-hurd?' predicate., guix-commits, 2021/07/14
- 06/22: net-base: Don't cross-compile., guix-commits, 2021/07/14
- 14/22: openssl: Use G-exp machinery for referring to outputs., guix-commits, 2021/07/14
- 20/22: glib: Look up "tzdata" in 'native-inputs', not 'inputs'.,
guix-commits <=
- 21/22: libelf: Update configure script and config.guess and config.sub., guix-commits, 2021/07/14
- 15/22: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/14
- 19/22: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/14
- 16/22: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/14
- 04/22: utils: Define a target-x86-32? and target-x86-64? predicate., guix-commits, 2021/07/14
- 01/22: utils: Define 'target-linux?' predicate., guix-commits, 2021/07/14
- 03/22: utils: Give 'target-mingw?' a docstring., guix-commits, 2021/07/14
- 08/22: libgpg-error: Remove trailing #f from phases., guix-commits, 2021/07/14
- 10/22: libgpg-error: Fix cross-compilation error., guix-commits, 2021/07/14
- 18/22: glib: Use a correct python in scripts when cross-compiling., guix-commits, 2021/07/14