[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH 14/31] gnu: ath9k-htc-firmware: Fix cross compilation
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH 14/31] gnu: ath9k-htc-firmware: Fix cross compilation. |
Date: |
Mon, 8 Jul 2019 11:58:56 +0200 |
* gnu/packages/firmware.scm (ath9k-htc-firmware)[phases]: Search for
"cross-gcc" in native-inputs and 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 90cb8845cf..e72a8d2cbd 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Vagrant Cascadian <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; 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 inputs 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 (or native-inputs inputs)
"cross-gcc")
"\n")))
#t))
(replace 'install
--
2.17.1
[bug#36477] [PATCH 14/31] gnu: ath9k-htc-firmware: Fix cross compilation.,
Mathieu Othacehe <=
[bug#36477] [PATCH 10/31] gnu: openssl: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 12/31] gnu: cmake: Extend CMAKE_PREFIX_PATH to non-native inputs., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 07/31] gnu: libgpg-error: Fix cross compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 04/31] gnu: tk: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 11/31] gnu: texinfo: Fix cross-compilation., Mathieu Othacehe, 2019/07/08