[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/33: gnu: ath9k-htc-firmware: Fix cross compilation.
From: |
guix-commits |
Subject: |
10/33: gnu: ath9k-htc-firmware: Fix cross compilation. |
Date: |
Tue, 24 Sep 2019 02:17:47 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-next
in repository guix.
commit 283fb648514b68c07203a388fc04cbd2ba7cd3a4
Author: Mathieu Othacehe <address@hidden>
Date: Wed Mar 6 11:26:35 2019 +0100
gnu: ath9k-htc-firmware: Fix cross compilation.
* 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 c473ccd..3104d78 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
- branch core-updates-next updated (567cca2 -> 647cfcf), guix-commits, 2019/09/24
- 01/33: gnu: perl: Fix cross-compilation., guix-commits, 2019/09/24
- 03/33: gnu: tcl: Fix cross-compilation., guix-commits, 2019/09/24
- 04/33: gnu: tk: Fix cross-compilation., guix-commits, 2019/09/24
- 02/33: gnu: python: Fix cross compilation., guix-commits, 2019/09/24
- 06/33: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/09/24
- 05/33: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/09/24
- 08/33: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/09/24
- 09/33: gnu: libgit2: Fix cross compilation., guix-commits, 2019/09/24
- 13/33: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/09/24
- 10/33: gnu: ath9k-htc-firmware: Fix cross compilation.,
guix-commits <=
- 12/33: gnu: help2man: Fix cross-compilation., guix-commits, 2019/09/24
- 24/33: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/09/24
- 23/33: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/09/24
- 27/33: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/09/24
- 07/33: gnu: python: Further cross-compilation fixes., guix-commits, 2019/09/24
- 33/33: gnu: libtool: Fix cross-compilation., guix-commits, 2019/09/24
- 21/33: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/09/24
- 30/33: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/09/24
- 15/33: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/09/24
- 14/33: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/09/24