>From 9e272374a3531d1df6d36e595dad0b715731e4cd Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 16 Jan 2016 22:02:22 +1000 Subject: [PATCH 1/2] build: Accept source archives that do not contain a directory. * guix/build/gnu-build-system.scm (unpack): Do not attempt to change directory after extracting archive if the archive does not contain any directories. --- guix/build/gnu-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index ff7646b..f1a84ef 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -142,7 +142,10 @@ working directory." (and (if (string-suffix? ".zip" source) (zero? (system* "unzip" source)) (zero? (system* "tar" "xvf" source))) - (chdir (first-subdirectory "."))))) + (let ((subdirectory (first-subdirectory "."))) + (if subdirectory + (chdir (first-subdirectory ".")) + #t))))) ;; See . (define* (patch-usr-bin-file #:key native-inputs inputs -- 2.6.3