gnu: bootloaders: Fix make-u-boot-sunxi64-package cross-compilation.
authorMathieu Othacehe <m.othacehe@gmail.com>
Sat, 14 Dec 2019 16:35:02 +0000 (17:35 +0100)
committerMathieu Othacehe <m.othacehe@gmail.com>
Sat, 14 Dec 2019 16:41:10 +0000 (17:41 +0100)
* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)[arguments]:
Search in native-inputs to fix cross-compilation.

gnu/packages/bootloaders.scm

index 55b4abb..91d5672 100644 (file)
@@ -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") ":"