Subject: [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: Use gexps and fix build.

From: Maxim Cournoyer <[email-masked]>
Date: Sun, 15 Jan 2023 22:25:40 -0500

* gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)
[arguments]: Use gexps.
[native-inputs]: Remove input labels and use modify-inputs, and turn into...
[inputs]: ... this.

---

(no changes since v4)

Changes in v4:
- Make arm-trusted-firmware-rk3328 a regular input

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

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 53e6557ac7..64af453844 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1136,14 +1136,13 @@ (define-public u-boot-rock64-rk3328
       (arguments
        (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'set-environment
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let ((bl31 (search-input-file inputs "/bl31.elf")))
-                   (setenv "BL31" bl31))))))))
-      (native-inputs
-       `(("firmware" ,arm-trusted-firmware-rk3328)
-         ,@(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"))))))))
+      (inputs
+       (modify-inputs (package-inputs base)
+         (append arm-trusted-firmware-rk3328))))))
 
 (define-public u-boot-firefly-rk3399
   (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu")))
-- 
2.38.1