me
/
guix
Archived
1
0
Fork 0
Code

gnu: nghttp2: Fix cross-compilation. 

* gnu/packages/web.scm (nghttp2)[arguments]: In set-timezone-directory
phase, search in both inputs and native-inputs.
master
Pierre-Moana Levesque 2019-07-31 13:18:08 +02:00 committed by Mathieu Othacehe
parent eff633257c
commit 8e8855f9aa
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/web.scm
View File

@ -36,6 +36,7 @@
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -6444,8 +6445,9 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
(assoc-ref outputs "lib"))) (assoc-ref outputs "lib")))
#t)) #t))
(add-before 'check 'set-timezone-directory (add-before 'check 'set-timezone-directory
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR" (string-append
(assoc-ref (or native-inputs inputs) "tzdata")
"/share/zoneinfo")) "/share/zoneinfo"))
#t))))) #t)))))
(home-page "https://nghttp2.org/") (home-page "https://nghttp2.org/")