guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/61: gnu: ath9k-htc-firmware: Fix cross compilation.


From: guix-commits
Subject: 14/61: gnu: ath9k-htc-firmware: Fix cross compilation.
Date: Wed, 21 Aug 2019 04:24:50 -0400 (EDT)

mothacehe pushed a commit to branch wip-cross-system
in repository guix.

commit 58efd7b9bf7cfeb7717960eaf9e1dc5ccae64884
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



reply via email to

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