mothacehe pushed a commit to branch core-updates-next
in repository guix.
commit 8e8855f9aa0521ade0741896b2285d9ddf493fed
Author: Pierre-Moana Levesque <[email protected]>
Date: Wed Jul 31 13:18:08 2019 +0200
gnu: nghttp2: Fix cross-compilation.
* gnu/packages/web.scm (nghttp2)[arguments]: In set-timezone-directory
phase, search in both inputs and native-inputs.
---
gnu/packages/web.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b415a14..d23f6cb 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -36,6 +36,7 @@
;;; Copyright © 2019 Hartmut Goebel <[email protected]>
;;; Copyright © 2019 Jakob L. Kreuze <[email protected]>
;;; Copyright © 2019 Mathieu Othacehe <[email protected]>
+;;; Copyright © 2019 Pierre-Moana Levesque <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6444,9 +6445,10 @@ derivation by David Revoy from the original MonsterID by
Andreas Gohr.")
(assoc-ref outputs "lib")))
#t))
(add-before 'check 'set-timezone-directory
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")
- "/share/zoneinfo"))
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (setenv "TZDIR" (string-append
+ (assoc-ref (or native-inputs inputs) "tzdata")
+ "/share/zoneinfo"))
#t)))))
(home-page "https://nghttp2.org/";)
(synopsis "HTTP/2 protocol client, proxy, server, and library")
