self: Add dependency on lzlib.
* guix/self.scm (compiled-guix): Pass #:lzlib to 'make-config.scm'. (make-config.scm): Add #:lzlib and honor it. (specification->package): Add "lzlib".
This commit is contained in:
parent
66229b04ae
commit
73ac9098b1
|
@ -57,6 +57,7 @@
|
|||
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
|
||||
("gnutls" (ref '(gnu packages tls) 'gnutls))
|
||||
("zlib" (ref '(gnu packages compression) 'zlib))
|
||||
("lzlib" (ref '(gnu packages compression) 'lzlib))
|
||||
("gzip" (ref '(gnu packages compression) 'gzip))
|
||||
("bzip2" (ref '(gnu packages compression) 'bzip2))
|
||||
("xz" (ref '(gnu packages compression) 'xz))
|
||||
|
@ -660,6 +661,7 @@ Info manual."
|
|||
(guile-version (effective-version))
|
||||
(guile-for-build (default-guile))
|
||||
(zlib (specification->package "zlib"))
|
||||
(lzlib (specification->package "lzlib"))
|
||||
(gzip (specification->package "gzip"))
|
||||
(bzip2 (specification->package "bzip2"))
|
||||
(xz (specification->package "xz"))
|
||||
|
@ -814,6 +816,7 @@ Info manual."
|
|||
#:extra-modules
|
||||
`(((guix config)
|
||||
=> ,(make-config.scm #:zlib zlib
|
||||
#:lzlib lzlib
|
||||
#:gzip gzip
|
||||
#:bzip2 bzip2
|
||||
#:xz xz
|
||||
|
@ -911,7 +914,7 @@ Info manual."
|
|||
(variables rest ...))))))
|
||||
(variables %localstatedir %storedir %sysconfdir)))
|
||||
|
||||
(define* (make-config.scm #:key zlib gzip xz bzip2
|
||||
(define* (make-config.scm #:key zlib lzlib gzip xz bzip2
|
||||
(package-name "GNU Guix")
|
||||
(package-version "0")
|
||||
(bug-report-address "bug-guix@gnu.org")
|
||||
|
@ -933,7 +936,7 @@ Info manual."
|
|||
%store-database-directory
|
||||
%config-directory
|
||||
%libz
|
||||
;; TODO: %liblz
|
||||
%liblz
|
||||
%gzip
|
||||
%bzip2
|
||||
%xz))
|
||||
|
@ -980,7 +983,11 @@ Info manual."
|
|||
|
||||
(define %libz
|
||||
#+(and zlib
|
||||
(file-append zlib "/lib/libz"))))
|
||||
(file-append zlib "/lib/libz")))
|
||||
|
||||
(define %liblz
|
||||
#+(and lzlib
|
||||
(file-append lzlib "/lib/liblz"))))
|
||||
|
||||
;; Guile 2.0 *requires* the 'define-module' to be at the
|
||||
;; top-level or the 'toplevel-ref' in the resulting .go file are
|
||||
|
|
Loading…
Reference in New Issue