From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58896) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPn-00071z-Ee for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPm-0005Qt-A7 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPm-0005Qo-7K for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPm-0006c2-5b for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Subject: [bug#36477] [PATCH v2 35/61] gnu: nghttp2: Fix cross-compilation. Resent-Message-ID: From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:29 +0200 Message-Id: <20190821085455.18508-35-m.othacehe@gmail.com> In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36477@debbugs.gnu.org Cc: Pierre-Moana Levesque From: Pierre-Moana Levesque * 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 06b3778be2..c0aab76aba 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; 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") -- 2.17.1