summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-05-14 22:50:53 +0200
committerLudovic Courtès <ludo@gnu.org>2021-05-14 23:24:08 +0200
commit0b1f70d1a792af40aa0d13b3d227fde88f02d061 (patch)
treebcf78beb26cc3367836cb3a5991c96f571bb2251
parente4beaa7c8a71f4fdfe1948a3d96e5214407b7e49 (diff)
downloadguix-0b1f70d1a792af40aa0d13b3d227fde88f02d061.tar.gz
gnu: guix: Add dependency on Disarchive.
This enables the Disarchive fallback implemented in commit
fbc2a52a32ddc664db8ebab420c2e17b1432c744.

* gnu/packages/package-management.scm (guix)[inputs]: Add DISARCHIVE.
[arguments]: In 'wrap-program' phase, add DISARCHIVE to the search path.
-rw-r--r--gnu/packages/package-management.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index ef5d973e19..c72c2211b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -312,9 +312,11 @@ $(prefix)/etc/openrc\n")))
                                                   "guile-bytestructures"))
                                (ssh    (assoc-ref inputs "guile-ssh"))
                                (gnutls (assoc-ref inputs "gnutls"))
+                               (disarchive (assoc-ref inputs "disarchive"))
                                (locales (assoc-ref inputs "glibc-utf8-locales"))
                                (deps   (list gcrypt json sqlite gnutls git
-                                             bs ssh zlib lzlib zstd guile-lib))
+                                             bs ssh zlib lzlib zstd guile-lib
+                                             disarchive))
                                (deps*  (if avahi (cons avahi deps) deps))
                                (effective
                                 (read-line
@@ -416,6 +418,8 @@ $(prefix)/etc/openrc\n")))
          ("bootstrap/tar" ,(bootstrap-executable "tar" (%current-system)))
          ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
 
+         ("disarchive" ,disarchive)               ;for 'guix perform-download'
+
          ("glibc-utf8-locales" ,glibc-utf8-locales)))
       (propagated-inputs
        `(("gnutls" ,gnutls)