From 543aab899209e801a23b8cd0e9d9ea154c91136f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 8 Aug 2021 10:58:47 +0300
Subject: [PATCH] gnu: p7zip: Remove input labels.

* gnu/packages/compression.scm (p7zip)[native-inputs]: Rewrite using
target macros and remove labels.
---
 gnu/packages/compression.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index b68bb7a002..975d2da16b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1350,13 +1350,11 @@ (define-public p7zip
                (invoke "make" "test_7z")
                (invoke "make" "test_7zr")))))))
     (native-inputs
-     (let ((system (or (%current-target-system)
-                       (%current-system))))
-       `(,@(cond ((string-prefix? "x86_64" system)
-                  `(("yasm" ,yasm)))
-                 ((string-prefix? "i686" system)
-                  `(("nasm" ,nasm)))
-                 (else '())))))
+      (cond ((target-x86-64?)
+             (list yasm))
+            ((target-x86-32?)
+             (list nasm))
+            (else '())))
     (home-page "http://p7zip.sourceforge.net/")
     (synopsis "Command-line file archiver with high compression ratio")
     (description "p7zip is a command-line port of 7-Zip, a file archiver that