[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: gnu: p7zip: Remove input labels.
From: |
guix-commits |
Subject: |
04/04: gnu: p7zip: Remove input labels. |
Date: |
Sun, 8 Aug 2021 04:32:22 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit 543aab899209e801a23b8cd0e9d9ea154c91136f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 8 10:58:47 2021 +0300
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 b68bb7a..975d2da 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1350,13 +1350,11 @@ for most inputs, but the resulting compressed files are
anywhere from 20% to
(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