diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-12 22:56:02 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-18 21:04:24 -0500 |
| commit | c9c195936d128465030bc05f8c319367602c93b5 (patch) | |
| tree | 0ccfeb0f07982ed1dc9e62c70ffb3e4915f94ec0 | |
| parent | 980abad24d0b4a9a77c829016aa7dc0a5ac4f5bc (diff) | |
| download | guix-c9c195936d128465030bc05f8c319367602c93b5.tar guix-c9c195936d128465030bc05f8c319367602c93b5.tar.gz | |
gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps.
* gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]:
Remove input labels.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
| -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 290d832a83..f3b3c91c47 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1221,17 +1221,16 @@ BOOT_TARGET_NVME(func) \\ (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 (make-u-boot-bin-package u-boot-package #:key |