apteryx pushed a commit to branch master
in repository guix.
commit 3f398ea9520b4dcaf738d91b32ef4dd50579ea01
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Tue Dec 20 10:46:57 2022 -0500
gnu: u-boot-firefly-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use
gexps.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/bootloaders.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index f3b3c91c47..624a832802 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1156,16 +1156,16 @@ partition."))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "BL31" (search-input-file inputs "/bl31.elf"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
- (native-inputs
- `(("firmware" ,arm-trusted-firmware-rk3399)
- ,@(package-native-inputs base))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (setenv "BL31" (search-input-file inputs "bl31.elf"))))
+ ;; Phases do not succeed on the bl31 ELF.
+ (delete 'strip)
+ (delete 'validate-runpath)))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append arm-trusted-firmware-rk3399))))))
(define-public u-boot-rockpro64-rk3399
(let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu"
