guix-commits
[Top][All Lists]
Advanced

[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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]