[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: packages: Add zip archive support to 'patch-and-repack'.
From: |
Eric Bavier |
Subject: |
01/01: packages: Add zip archive support to 'patch-and-repack'. |
Date: |
Tue, 24 Mar 2015 21:04:27 +0000 |
bavier pushed a commit to branch core-updates
in repository guix.
commit 17287d7d47567aa1649250182e0f7ab11d5d55d1
Author: Eric Bavier <address@hidden>
Date: Tue Mar 24 10:52:05 2015 -0500
packages: Add zip archive support to 'patch-and-repack'.
Fixes <http://bugs.gnu.org/19830>.
* guix/packages.scm (%standard-patch-inputs): Add "unzip".
(patch-and-repack)[decompression-type]: Detect zip archive.
[build]: Invoke "unzip" when appropriate.
---
guix/packages.scm | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index ca9d3a9..99fbd24 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -335,6 +335,7 @@ corresponds to the arguments expected by
`set-path-environment-variable'."
("bzip2" ,(ref '(gnu packages compression) 'bzip2))
("gzip" ,(ref '(gnu packages compression) 'gzip))
("lzip" ,(ref '(gnu packages compression) 'lzip))
+ ("unzip" ,(ref '(gnu packages zip) 'unzip))
("patch" ,(ref '(gnu packages base) 'patch))
("locales" ,(ref '(gnu packages commencement)
'glibc-utf8-locales-final)))))
@@ -384,6 +385,7 @@ IMPORTED-MODULES specify modules to use/import for use by
SNIPPET."
(cond ((string-suffix? "gz" source-file-name) "gzip")
((string-suffix? "bz2" source-file-name) "bzip2")
((string-suffix? "lz" source-file-name) "lzip")
+ ((string-suffix? "zip" source-file-name) "unzip")
(else "xz")))
(define original-file-name
@@ -464,8 +466,10 @@ IMPORTED-MODULES specify modules to use/import for use by
SNIPPET."
(mkdir directory)
(copy-recursively #$source directory)
#t)
- (zero? (system* (string-append #$tar "/bin/tar")
- "xvf" #$source)))
+ #$(if (string=? decompression-type "unzip")
+ #~(zero? (system* "unzip" #$source))
+ #~(zero? (system* (string-append #$tar "/bin/tar")
+ "xvf" #$source))))
(let ((directory (first-file ".")))
(format (current-error-port)
"source is under '~a'~%" directory)