From db78fc0679945e37e5ee3bfc28a363cabfda6800 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:35:02 +0100 Subject: [PATCH] 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 55b4abbda5..91d567288f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -662,9 +662,11 @@ (define-public (make-u-boot-sunxi64-package board triplet) ((#: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") ":"