mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: guix: Add dependency on Disarchive.
This enables the Disarchive fallback implemented in commit
fbc2a52a32
.
* gnu/packages/package-management.scm (guix)[inputs]: Add DISARCHIVE.
[arguments]: In 'wrap-program' phase, add DISARCHIVE to the search path.
This commit is contained in:
parent
e4beaa7c8a
commit
0b1f70d1a7
1 changed files with 5 additions and 1 deletions
|
@ -312,9 +312,11 @@ (define code
|
||||||
"guile-bytestructures"))
|
"guile-bytestructures"))
|
||||||
(ssh (assoc-ref inputs "guile-ssh"))
|
(ssh (assoc-ref inputs "guile-ssh"))
|
||||||
(gnutls (assoc-ref inputs "gnutls"))
|
(gnutls (assoc-ref inputs "gnutls"))
|
||||||
|
(disarchive (assoc-ref inputs "disarchive"))
|
||||||
(locales (assoc-ref inputs "glibc-utf8-locales"))
|
(locales (assoc-ref inputs "glibc-utf8-locales"))
|
||||||
(deps (list gcrypt json sqlite gnutls git
|
(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))
|
(deps* (if avahi (cons avahi deps) deps))
|
||||||
(effective
|
(effective
|
||||||
(read-line
|
(read-line
|
||||||
|
@ -416,6 +418,8 @@ (define code
|
||||||
("bootstrap/tar" ,(bootstrap-executable "tar" (%current-system)))
|
("bootstrap/tar" ,(bootstrap-executable "tar" (%current-system)))
|
||||||
("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
|
("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
|
||||||
|
|
||||||
|
("disarchive" ,disarchive) ;for 'guix perform-download'
|
||||||
|
|
||||||
("glibc-utf8-locales" ,glibc-utf8-locales)))
|
("glibc-utf8-locales" ,glibc-utf8-locales)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("gnutls" ,gnutls)
|
`(("gnutls" ,gnutls)
|
||||||
|
|
Loading…
Reference in a new issue