diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 00:10:23 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 00:10:23 +0200 |
commit | bdb90df764661c11b37c988ea129c8e7a01b1889 (patch) | |
tree | c320b71b136bfcc5e5ec949279a05c8134fb0cca /guix/download.scm | |
parent | b859a1bf7953eb98668cb11b459cde48b0dce991 (diff) | |
parent | 8ec9c5fd880be35fe322b0d4dbc69bd2c6c89ef1 (diff) | |
download | guix-patches-bdb90df764661c11b37c988ea129c8e7a01b1889.tar guix-patches-bdb90df764661c11b37c988ea129c8e7a01b1889.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/download.scm')
-rw-r--r-- | guix/download.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/guix/download.scm b/guix/download.scm index 91a2b4ce5f..c3dc5a208c 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -531,7 +531,8 @@ own. This helper makes it easier to deal with \"tar bombs\"." (string-append "tarbomb-" (or name file-name)) #:system system - #:guile guile))) + #:guile guile)) + (guile (package->derivation guile system))) ;; Take the tar bomb, and simply unpack it as a directory. ;; Use ungrafted tar/gzip so that the resulting tarball doesn't depend on ;; whether grafts are enabled. @@ -544,6 +545,8 @@ own. This helper makes it easier to deal with \"tar bombs\"." (chdir #$output) (invoke (string-append #$tar "/bin/tar") "xf" #$drv))) + #:system system + #:guile-for-build guile #:graft? #f #:local-build? #t))) @@ -566,7 +569,8 @@ own. This helper makes it easier to deal with \"zip bombs\"." (string-append "zipbomb-" (or name file-name)) #:system system - #:guile guile))) + #:guile guile)) + (guile (package->derivation guile system))) ;; Take the zip bomb, and simply unpack it as a directory. ;; Use ungrafted unzip so that the resulting tarball doesn't depend on ;; whether grafts are enabled. @@ -578,6 +582,8 @@ own. This helper makes it easier to deal with \"zip bombs\"." (chdir #$output) (invoke (string-append #$unzip "/bin/unzip") #$drv))) + #:system system + #:guile-for-build guile #:graft? #f #:local-build? #t))) |