summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2019-12-14 17:35:02 +0100
committerMathieu Othacehe <m.othacehe@gmail.com>2019-12-14 17:40:16 +0100
commitde5394f7456900146e217864aa2d58127a1dbc33 (patch)
treebe87266f51b977131babedd39d3449b12480d2f3
parent6d01ff96a38aea7535299246f8a32d014ded28d1 (diff)
downloadguix-de5394f7456900146e217864aa2d58127a1dbc33.tar.gz
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.
-rw-r--r--gnu/packages/bootloaders.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 55b4abbda5..91d567288f 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") ":"