diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-20 22:50:19 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-21 13:14:21 -0500 |
| commit | a4c0315a2ea131c95fdb60e3a8993f114f0abd26 (patch) | |
| tree | 4850ae553f644b31ae7a4fa9a4b292bff61f7b15 | |
| parent | 1e4ad02c4c94cd40aeccbef493255c5232d8fe07 (diff) | |
packages: Fix repacked file name extension when zstd is unavailable.
This is a follow-up commit to a869f4bef3 ("packages: Repack patched source
archives via zstd by default.").
* guix/packages.scm (patch-and-repack): Do not have xz fallback into the zstd
variable, which is confusing and caused the extension selection to be wrong
when the xz fallback was used. Refine how PATH is set to avoid duplicates.
Change-Id: I580deba4de822eccf5f6fe53355b8ba57178c166
| -rw-r--r-- | guix/packages.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index ce1ba7c53a..64d1bc6158 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -949,10 +949,7 @@ specifies modules in scope when evaluating SNIPPET." (bzip2 (lookup-input "bzip2")) (lzip (lookup-input "lzip")) (xz (lookup-input "xz")) - (zstd (or (lookup-input "zstd") - ;; Fallback to xz in case zstd is not available, such as - ;; for bootstrap packages. - xz)) + (zstd (lookup-input "zstd")) (patch (lookup-input "patch")) (comp (and=> (compressor source-file-name) lookup-input)) (patches (map instantiate-patch patches))) @@ -1033,10 +1030,13 @@ specifies modules in scope when evaluating SNIPPET." locale (system-error-errno args))))) (setenv "PATH" - (string-append #+zstd "/bin" - (if #+comp - (string-append ":" #+comp "/bin") - ""))) + (string-join + (map (cut string-append <> "/bin") + ;; Fallback to xz in case zstd is not + ;; available, such as for bootstrap packages. + (delete-duplicates + (filter-map identity (list #+zstd #+xz #+comp)))) + ":")) (setenv "ZSTD_NBTHREADS" (number->string (parallel-job-count))) |