diff mbox series

[bug#60224,v4,09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs.

Message ID 20230111204433.15305-9-maxim.cournoyer@gmail.com
State New
Headers show
Series [bug#60224,v4,01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps. | expand

Commit Message

Maxim Cournoyer Jan. 11, 2023, 8:44 p.m. UTC 
* gnu/packages/bootloaders.scm (u-boot-sifive-unmatched)
[arguments]: Use gexps.  Use search-input-file.
[inputs]: Remove labels.  Use modify-inputs.
---

(no changes since v1)

 gnu/packages/bootloaders.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 464c1f5729..b2e15b88f1 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1128,15 +1128,14 @@  (define-public u-boot-sifive-unmatched
       (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")))