[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: unzip: Fix cross-compilation.
From: |
guix-commits |
Subject: |
02/02: gnu: unzip: Fix cross-compilation. |
Date: |
Thu, 11 Aug 2022 06:24:28 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 45db0ca5e9b8a7bca34d8c87d76debfda56c824d
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Aug 7 02:00:00 2022 +0200
gnu: unzip: Fix cross-compilation.
Fixes <https://issues.guix.gnu.org/57127>.
* gnu/packages/compression.scm (unzip)[arguments]: Use #$output when
cross-compiling.
---
gnu/packages/compression.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 026629cad1..684979018c 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1838,9 +1838,13 @@ Compression ratios of 2:1 to 3:1 are common for text
files.")
#:make-flags
;; Fix cross-compilation without affecting native builds, as doing
so
;; would trigger too many rebuilds:
https://issues.guix.gnu.org/57127
- #~(list "-f" "unix/Makefile"
- (string-append "prefix=" %output)
- (string-append "MANDIR=" %output "/share/man/man1"))))
+ (if (%current-target-system)
+ #~(list "-f" "unix/Makefile"
+ (string-append "prefix=" #$output)
+ (string-append "MANDIR=" #$output "/share/man/man1"))
+ #~(list "-f" "unix/Makefile"
+ (string-append "prefix=" %output)
+ (string-append "MANDIR=" %output "/share/man/man1")))))
(home-page "http://www.info-zip.org/UnZip.html")
(synopsis "Decompression and file extraction utility")
(description