guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

18/20: glib: Look up "tzdata" in 'native-inputs', not 'inputs'.


From: guix-commits
Subject: 18/20: glib: Look up "tzdata" in 'native-inputs', not 'inputs'.
Date: Mon, 12 Jul 2021 11:15:45 -0400 (EDT)

mothacehe pushed a commit to branch wip-meson
in repository guix.

commit 350c2e0e2818063f1304d44e2bc6b58017cbd875
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Jul 11 13:47:21 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]