diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-20 11:38:42 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-18 21:04:25 -0500 |
commit | 4dd0378d4755b10b885292bb6840baa35548560b (patch) | |
tree | b8214f884392f1144daa457607e853339a48242c | |
parent | e7d82f472250a8e7eaf9559208fae996e592f5b4 (diff) |
gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels.
* gnu/packages/bootloaders.scm (u-boot-sifive-unmatched)
[arguments]: Use gexps. Use search-input-file.
[inputs]: Remove labels. Use modify-inputs.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-rw-r--r-- | gnu/packages/bootloaders.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 64af453844..d9f9672f77 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1119,15 +1119,14 @@ partition.")) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((opensbi (string-append (assoc-ref inputs "firmware") - "/fw_dynamic.bin"))) - (setenv "OPENSBI" opensbi)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "OPENSBI" (search-input-file inputs + "fw_dynamic.bin")))))))) (inputs - `(("firmware" ,opensbi-generic) - ,@(package-inputs base)))))) + (modify-inputs (package-inputs base) + (append opensbi-generic)))))) (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) |