diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/utils.scm | 7 | ||||
| -rw-r--r-- | guix/packages.scm | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e8efb0653a..6d3c29d001 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -32,7 +32,12 @@ #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:re-export (alist-cons - alist-delete) + alist-delete + + ;; Note: Re-export 'delete' to allow for proper syntax matching + ;; in 'modify-phases' forms. See + ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>. + delete) #:export (%store-directory store-file-name? strip-store-file-name diff --git a/guix/packages.scm b/guix/packages.scm index f4967f98fa..97580352e2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -578,7 +578,12 @@ specifies modules in scope when evaluating SNIPPET." #:fail-on-error? #t))))) (zero? (apply system* (string-append #+tar "/bin/tar") - "cvfa" #$output + "cvf" #$output + ;; The bootstrap xz does not support + ;; threaded compression (introduced in + ;; 5.2.0), but it ignores the extra flag. + (string-append "--use-compress-program=" + #+xz "/bin/xz --threads=0") ;; avoid non-determinism in the archive "--mtime=@0" "--owner=root:0" |