[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/61: gnu: nghttp2: Fix cross-compilation.
From: |
guix-commits |
Subject: |
35/61: gnu: nghttp2: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 04:24:54 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit ec798e0fef3c61381e5fd1807f6d9fb1abfba219
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 06b3778..c0aab76 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.
;;;
@@ -6447,9 +6448,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")
- 43/61: gnu: guile-gcrypt: Fix cross-compilation., (continued)
- 43/61: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/21
- 56/61: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/21
- 59/61: system: vm: Add arm64 support., guix-commits, 2019/08/21
- 61/61: scripts: system: Add --target option., guix-commits, 2019/08/21
- 25/61: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/21
- 29/61: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/21
- 21/61: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/21
- 20/61: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 23/61: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/21
- 33/61: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/21
- 35/61: gnu: nghttp2: Fix cross-compilation.,
guix-commits <=
- 36/61: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/21
- 37/61: gnu: swig: Fix cross-compilation., guix-commits, 2019/08/21
- 18/61: gnu: bc: Fix cross-compilation., guix-commits, 2019/08/21
- 38/61: gnu: git: Fix cross-compilation., guix-commits, 2019/08/21
- 47/61: gnu: crda: Fix cross-compilation, guix-commits, 2019/08/21
- 46/61: gnu: libnl: Fix cross-compilation., guix-commits, 2019/08/21
- 45/61: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/08/21
- 49/61: gnu: guile-wm: Fix cross-compilation., guix-commits, 2019/08/21
- 44/61: gnu: libtool: Fix cross-compilation., guix-commits, 2019/08/21
- 50/61: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/21