From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000205-J5 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00057S-EM for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3F-000537-2Z for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3E-0003MV-U3 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 Subject: [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation. Resent-Message-ID: From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:54 +0200 Message-Id: <20190412131556.25282-4-m.othacehe@gmail.com> In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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: 35244@debbugs.gnu.org Cc: Mathieu Othacehe * gnu/packages/firmware.scm (ath9k-htc-firmware)[phases]: Search for "cross-gcc" in native-inputs in "configure" phase. --- gnu/packages/firmware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 4df4b22843..68476ed826 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,7 @@ '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs #:allow-other-keys) (chdir "target_firmware") ;; 'configure' is a simple script that runs 'cmake' with @@ -67,7 +68,7 @@ (substitute* "configure" (("^TOOLCHAIN=.*$") (string-append "TOOLCHAIN=" - (assoc-ref inputs "cross-gcc") + (assoc-ref native-inputs "cross-gcc") "\n"))) #t)) (replace 'install -- 2.17.1