diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-11 09:59:42 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-18 21:04:25 -0500 |
| commit | 12f1b5fe4eb3eaf4a83854af3328c9a604e50ad7 (patch) | |
| tree | c22d7e5907fa069773cad0397d42e41867121b09 /gnu | |
| parent | 4276283b30eb73359e27c7737b78655fed0a664f (diff) | |
| download | guix-12f1b5fe4eb3eaf4a83854af3328c9a604e50ad7.tar.gz | |
gnu: u-boot-puma-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9da97232ea..4cf6a74022 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1091,17 +1091,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 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-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) |