Message ID | 20191228214622.4061-1-dannym@scratchpost.org |
---|---|
State | Under Review |
Headers | show |
Series | [bug#38781,core-updates] build-system/gnu: Make 'first-subdirectory' optional. | expand |
Danny Milosavljevic <dannym@scratchpost.org> writes: > * guix/build/gnu-build-system.scm (unpack): Make 'first-subdirectory' > optional. Do you have a use case for this change?
Hi, Marius Bakke <mbakke@fastmail.com> writes: > Danny Milosavljevic <dannym@scratchpost.org> writes: > >> * guix/build/gnu-build-system.scm (unpack): Make 'first-subdirectory' >> optional. > > Do you have a use case for this change? Closing as the use case is not clear.
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 4df0bb4904..4ebaa455b0 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -160,7 +160,7 @@ working directory." (if (string-suffix? ".zip" source) (invoke "unzip" source) (invoke "tar" "xvf" source)) - (chdir (first-subdirectory ".")))) + (chdir (or (first-subdirectory ".") ".")))) #t) (define %bootstrap-scripts