aboutsummaryrefslogtreecommitdiff
path: root/gnu
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:41:10 +0100
commitdb78fc0679945e37e5ee3bfc28a363cabfda6800 (patch)
tree9a8728ffbf7b67da5eed39bd35593f9e44d40c75 /gnu
parentaf58b275c95410dca556f91760e293535f9eb511 (diff)
downloadguix-db78fc0679945e37e5ee3bfc28a363cabfda6800.tar
guix-db78fc0679945e37e5ee3bfc28a363cabfda6800.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.
Diffstat (limited to 'gnu')
-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") ":"