This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new daab3da504 gnu: u-boot-pine64-plus: Fix building on aarch64-linux.
daab3da504 is described below
commit daab3da5042a5803ffa13ee759b3f8895dd92de4
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Mar 28 17:39:42 2024 +0200
gnu: u-boot-pine64-plus: Fix building on aarch64-linux.
* gnu/packages/bootloaders.scm (u-boot-sunxi64-packages)[arguments]:
Also search in inputs for input files.
Change-Id: Ibc0f6b0dfff5eb7c561b7361dcf0eac1839fad87
---
gnu/packages/bootloaders.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 986f0ac035..cfe8046731 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016-2018, 2021-2023 Marius Bakke <[email protected]>
;;; Copyright © 2016, 2017 Danny Milosavljevic <[email protected]>
;;; Copyright © 2016, 2017 David Craven <[email protected]>
-;;; Copyright © 2017, 2018, 2020-2023 Efraim Flashner <[email protected]>
+;;; Copyright © 2017, 2018, 2020-2024 Efraim Flashner <[email protected]>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2019 nee <[email protected]>
;;; Copyright © 2019 Mathieu Othacehe <[email protected]>
@@ -1130,7 +1130,7 @@ removed so that it fits within common partitioning
schemes.")))
(add-after 'unpack 'set-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "SCP" (search-input-file
- native-inputs "libexec/scp.bin"))
+ (or native-inputs inputs) "libexec/scp.bin"))
(setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
