guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: bootloaders: Fix make-u-boot-sunxi64-package cross-compilati


From: guix-commits
Subject: 02/03: gnu: bootloaders: Fix make-u-boot-sunxi64-package cross-compilation.
Date: Sat, 14 Dec 2019 11:40:50 -0500 (EST)

mothacehe pushed a commit to branch core-updates
in repository guix.

commit de5394f7456900146e217864aa2d58127a1dbc33
Author: Mathieu Othacehe <address@hidden>
Date:   Sat Dec 14 17:35:02 2019 +0100

    gnu: bootloaders: Fix make-u-boot-sunxi64-package cross-compilation.
    
    * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)[arguments]:
    Search in native-inputs to fix cross-compilation.
---
 gnu/packages/bootloaders.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 55b4abb..91d5672 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -662,9 +662,11 @@ it fits within common partitioning schemes.")
           ((#:phases phases)
            `(modify-phases ,phases
               (add-after 'unpack 'set-environment
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (let ((bl31 (string-append (assoc-ref inputs "firmware")
-                                             "/bl31.bin")))
+                (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                  (let ((bl31
+                         (string-append
+                          (assoc-ref (or native-inputs inputs) "firmware")
+                          "/bl31.bin")))
                     (setenv "BL31" bl31)
                     ;; This is necessary when we're using the bundled dtc.
                     ;(setenv "PATH" (string-append (getenv "PATH") ":"



reply via email to

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