me
/
guix
Archived
1
0
Fork 0

self: Add dependency on Disarchive.

This enables the Disarchive fallback implemented in commit
fbc2a52a32 (on foreign distros).

* guix/self.scm (specification->package): Add "disarchive".
(compiled-guix): Add DISARCHIVE to DEPENDENCIES in the #:dependencies
argument to 'guix-command'.
master
Ludovic Courtès 2021-05-14 22:52:46 +02:00
parent 0b1f70d1a7
commit 67bf612554
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 1 deletions

View File

@ -63,6 +63,7 @@
("guile-zstd" (ref '(gnu packages guile) 'guile-zstd)) ("guile-zstd" (ref '(gnu packages guile) 'guile-zstd))
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
("gnutls" (ref '(gnu packages tls) 'gnutls)) ("gnutls" (ref '(gnu packages tls) 'gnutls))
("disarchive" (ref '(gnu packages backup) 'disarchive))
("gzip" (ref '(gnu packages compression) 'gzip)) ("gzip" (ref '(gnu packages compression) 'gzip))
("bzip2" (ref '(gnu packages compression) 'bzip2)) ("bzip2" (ref '(gnu packages compression) 'bzip2))
("xz" (ref '(gnu packages compression) 'xz)) ("xz" (ref '(gnu packages compression) 'xz))
@ -842,6 +843,9 @@ itself."
(define gnutls (define gnutls
(specification->package "gnutls")) (specification->package "gnutls"))
(define disarchive
(specification->package "disarchive"))
(define dependencies (define dependencies
(append-map transitive-package-dependencies (append-map transitive-package-dependencies
(list guile-gcrypt gnutls guile-git guile-avahi (list guile-gcrypt gnutls guile-git guile-avahi
@ -1026,7 +1030,8 @@ itself."
(let* ((modules (built-modules (compose list node-source+compiled))) (let* ((modules (built-modules (compose list node-source+compiled)))
(command (guix-command modules (command (guix-command modules
#:source source #:source source
#:dependencies dependencies #:dependencies
(cons disarchive dependencies)
#:guile guile-for-build #:guile guile-for-build
#:guile-version guile-version))) #:guile-version guile-version)))
(whole-package name modules dependencies (whole-package name modules dependencies