[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/64: gnu: nghttp2: Fix cross-compilation.
From: |
guix-commits |
Subject: |
35/64: gnu: nghttp2: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:21 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 591a3190fa40f2d746db1aab98845386b79ebd14
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")
- 44/64: gnu: guile-gcrypt: Fix cross-compilation., (continued)
- 44/64: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/23
- 05/64: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/23
- 03/64: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/23
- 09/64: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/23
- 10/64: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/23
- 13/64: gnu: libgit2: Fix cross compilation., guix-commits, 2019/08/23
- 11/64: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/08/23
- 27/64: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/08/23
- 24/64: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/08/23
- 28/64: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 35/64: gnu: nghttp2: Fix cross-compilation.,
guix-commits <=
- 38/64: gnu: swig: Fix cross-compilation., guix-commits, 2019/08/23
- 37/64: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/23
- 57/64: gnu: linux-libre: Enable built-in ext4 support., guix-commits, 2019/08/23
- 61/64: build: vm: Fix arm32 support., guix-commits, 2019/08/23
- 16/64: gnu: groff: Fix cross compilation., guix-commits, 2019/08/23
- 34/64: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/08/23
- 36/64: gnu: bdb: Fix cross-compilation., guix-commits, 2019/08/23
- 40/64: gnu: make-linux-libre: Fix cross-compilation., guix-commits, 2019/08/23
- 62/64: system: vm: Add arm64 support., guix-commits, 2019/08/23
- 15/64: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/08/23