[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: gnu: nghttp2: Fix cross-compilation.
From: |
guix-commits |
Subject: |
06/09: gnu: nghttp2: Fix cross-compilation. |
Date: |
Fri, 20 Sep 2019 04:18:00 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-next
in repository guix.
commit 5870bbf2c1d1dd70aa4dac3f9c2886c46b9f9c20
Author: Pierre-Moana Levesque <address@hidden>
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 8e4424b..c5ec216 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -36,6 +36,7 @@
;;; Copyright © 2019 Hartmut Goebel <address@hidden>
;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6441,9 +6442,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")
- branch core-updates-next updated (91acbda -> 3ed89b1), guix-commits, 2019/09/20
- 02/09: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/09/20
- 05/09: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/09/20
- 01/09: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/09/20
- 04/09: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/09/20
- 07/09: gnu: procps: Fix cross-compilation., guix-commits, 2019/09/20
- 03/09: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/09/20
- 09/09: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/09/20
- 06/09: gnu: nghttp2: Fix cross-compilation.,
guix-commits <=
- 08/09: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/09/20