diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-20 11:19:56 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-18 21:04:24 -0500 |
commit | 126e07a28e8b10b071868ac0c9bad736f674c74e (patch) | |
tree | a69b0c68b6df7b3ee950f10aec426ed0cb447d82 /gnu/packages/bootloaders.scm | |
parent | 3f398ea9520b4dcaf738d91b32ef4dd50579ea01 (diff) | |
download | guix-126e07a28e8b10b071868ac0c9bad736f674c74e.tar.gz guix-126e07a28e8b10b071868ac0c9bad736f674c74e.zip |
gnu: make-u-boot-sunxi64-package: Use gexps and fix build.
* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)
[native-inputs]: Turn into...
[inputs]: ... this.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
-rw-r--r-- | gnu/packages/bootloaders.scm | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 624a832802..53e6557ac7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1001,17 +1001,13 @@ removed so that it fits within common partitioning schemes."))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((bl31 - (string-append - (assoc-ref (or native-inputs inputs) "firmware") - "/bl31.bin"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(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.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-sun50i-a64)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) |