ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 15:22:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Maxime Devos 2021-07-14 13:13:05 +02:00 committed by Mathieu Othacehe
parent dcd48bfd84
commit 5a88b8df00
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/glib.scm
View file

@ -252,10 +252,11 @@ (define glib
(package-version python))))) (package-version python)))))
#t)) #t))
(add-before 'check 'pre-check (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. ;; For tests/gdatetime.c.
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (string-append (assoc-ref (or native-inputs inputs)
"tzdata")
"/share/zoneinfo")) "/share/zoneinfo"))
;; Some tests want write access there. ;; Some tests want write access there.
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))