[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/35: gnu: nghttp2: Fix cross-compilation.
From: |
guix-commits |
Subject: |
29/35: gnu: nghttp2: Fix cross-compilation. |
Date: |
Thu, 10 Oct 2019 11:33:20 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 8e8855f9aa0521ade0741896b2285d9ddf493fed
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 b415a14..d23f6cb 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.
;;;
@@ -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")
- 02/35: gnu: perl: Fix cross-compilation., (continued)
- 02/35: gnu: perl: Fix cross-compilation., guix-commits, 2019/10/10
- 05/35: gnu: tk: Fix cross-compilation., guix-commits, 2019/10/10
- 06/35: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/10/10
- 01/35: gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems., guix-commits, 2019/10/10
- 04/35: gnu: tcl: Fix cross-compilation., guix-commits, 2019/10/10
- 07/35: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/10/10
- 34/35: gnu: libtool: Fix cross-compilation., guix-commits, 2019/10/10
- 08/35: gnu: python: Further cross-compilation fixes., guix-commits, 2019/10/10
- 16/35: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/10/10
- 30/35: gnu: procps: Fix cross-compilation., guix-commits, 2019/10/10
- 29/35: gnu: nghttp2: Fix cross-compilation.,
guix-commits <=
- 09/35: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/10/10
- 03/35: gnu: python: Fix cross compilation., guix-commits, 2019/10/10
- 10/35: gnu: libgit2: Fix cross compilation., guix-commits, 2019/10/10
- 17/35: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/10/10
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/10/10
- 19/35: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/10/10
- 15/35: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/10/10
- 32/35: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/10/10
- 28/35: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/10/10
- 27/35: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/10/10