04/21: gnu: arm-trusted-firmware: Remove input labels.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit f11578e8d99648b2dd404001c9b82f27ff350c27
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jan 16 22:01:50 2022 +0100

    gnu: arm-trusted-firmware: Remove input labels.
    
    * gnu/packages/firmware.scm (make-arm-trusted-firmware)[native-inputs]: 
Remove
    labels.
---
 gnu/packages/firmware.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 98f36540fc..f42c0d7a3d 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -577,16 +577,17 @@ Virtual Machines.  OVMF contains a sample UEFI firmware 
for QEMU and KVM.")
                           "DEBUG=1")
        #:tests? #f)) ; no tests
     (native-inputs
-     `(,@(if (and (not (string-prefix? "aarch64" (%current-system)))
-                  (string-prefix? "aarch64" arch))
-           `(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu"))
-             ("cross-binutils" ,(cross-binutils "aarch64-linux-gnu")))
-           '())
-       ,@(if (and (not (string-prefix? "armhf" (%current-system)))
-                  (string-prefix? "armhf" arch))
-           `(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf"))
-             ("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf")))
-           '())))
+     (let ((system (%current-system)))
+       (cond
+        ((and (not (string-prefix? "aarch64" system))
+              (string-prefix? "aarch64" arch))
+         (list (cross-gcc "aarch64-linux-gnu")
+               (cross-binutils "aarch64-linux-gnu")))
+        ((and (not (string-prefix? "armhf" system))
+              (string-prefix? "armhf" arch))
+         (list (cross-gcc "arm-linux-gnueabihf")
+               (cross-binutils "arm-linux-gnueabihf")))
+        (else '()))))
     (home-page "https://www.trustedfirmware.org/";)
     (synopsis "Implementation of \"secure world software\"")
     (description