guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/08: build-system/gnu: Add support for zip archives.


From: Ludovic Courtès
Subject: 02/08: build-system/gnu: Add support for zip archives.
Date: Thu, 26 Feb 2015 23:09:51 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit cd0385b61a934eafe1601e7c22024cf452d357c2
Author: Ludovic Courtès <address@hidden>
Date:   Thu Feb 26 22:46:26 2015 +0100

    build-system/gnu: Add support for zip archives.
    
    Fixes <http://bugs.gnu.org/19866>.
    Reported by Andreas Enge <address@hidden>.
    
    * guix/build/gnu-build-system.scm (unpack): Use 'unzip' when SOURCE ends
      in '.zip'.
---
 guix/build/gnu-build-system.scm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 2880168..25df711 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -108,7 +108,9 @@ working directory."
         (copy-recursively source "."
                           #:keep-mtime? #t)
         #t)
-      (and (zero? (system* "tar" "xvf" source))
+      (and (if (string-suffix? ".zip" source)
+               (zero? (system* "unzip" source))
+               (zero? (system* "tar" "xvf" source)))
            (chdir (first-subdirectory ".")))))
 
 ;; See <http://bugs.gnu.org/17840>.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]