summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2022-08-07 02:00:00 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2022-08-07 02:00:00 +0200
commit45db0ca5e9b8a7bca34d8c87d76debfda56c824d (patch)
treec36b79146517bc1c1a2f90cbe9e46ffac99a24ae
parent36c5fa6c4d50999ca533be882e743a061b3ad0d8 (diff)
downloadguix-45db0ca5e9b8a7bca34d8c87d76debfda56c824d.tar.gz
gnu: unzip: Fix cross-compilation.
Fixes <https://issues.guix.gnu.org/57127>.

* gnu/packages/compression.scm (unzip)[arguments]: Use #$output when
cross-compiling.
-rw-r--r--gnu/packages/compression.scm10
1 files 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