mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
self: Remove 'eval-when' from in generated (guix config).
* guix/self.scm (make-config.scm): Remove unneeded 'eval-when'.
This commit is contained in:
parent
f8fbe37654
commit
63cab4182d
1 changed files with 31 additions and 33 deletions
|
@ -399,45 +399,43 @@ (define defmod 'define-module)
|
|||
%xz
|
||||
%nix-instantiate))
|
||||
|
||||
;; XXX: Work around <http://bugs.gnu.org/15602>.
|
||||
(eval-when (expand load eval)
|
||||
#$@(map (match-lambda
|
||||
((name . value)
|
||||
#~(define-public #$name #$value)))
|
||||
%config-variables)
|
||||
#$@(map (match-lambda
|
||||
((name . value)
|
||||
#~(define-public #$name #$value)))
|
||||
%config-variables)
|
||||
|
||||
(define %guix-package-name #$package-name)
|
||||
(define %guix-version #$package-version)
|
||||
(define %guix-bug-report-address #$bug-report-address)
|
||||
(define %guix-home-page-url #$home-page-url)
|
||||
(define %guix-package-name #$package-name)
|
||||
(define %guix-version #$package-version)
|
||||
(define %guix-bug-report-address #$bug-report-address)
|
||||
(define %guix-home-page-url #$home-page-url)
|
||||
|
||||
(define %sbindir
|
||||
;; This is used to define '%guix-register-program'.
|
||||
;; TODO: Use a derivation that builds nothing but the
|
||||
;; C++ part.
|
||||
#+(and guix (file-append guix "/sbin")))
|
||||
(define %sbindir
|
||||
;; This is used to define '%guix-register-program'.
|
||||
;; TODO: Use a derivation that builds nothing but the
|
||||
;; C++ part.
|
||||
#+(and guix (file-append guix "/sbin")))
|
||||
|
||||
(define %guix-register-program
|
||||
(or (getenv "GUIX_REGISTER")
|
||||
(and %sbindir
|
||||
(string-append %sbindir "/guix-register"))))
|
||||
(define %guix-register-program
|
||||
(or (getenv "GUIX_REGISTER")
|
||||
(and %sbindir
|
||||
(string-append %sbindir "/guix-register"))))
|
||||
|
||||
(define %gzip
|
||||
#+(and gzip (file-append gzip "/bin/gzip")))
|
||||
(define %bzip2
|
||||
#+(and bzip2 (file-append bzip2 "/bin/bzip2")))
|
||||
(define %xz
|
||||
#+(and xz (file-append xz "/bin/xz")))
|
||||
(define %gzip
|
||||
#+(and gzip (file-append gzip "/bin/gzip")))
|
||||
(define %bzip2
|
||||
#+(and bzip2 (file-append bzip2 "/bin/bzip2")))
|
||||
(define %xz
|
||||
#+(and xz (file-append xz "/bin/xz")))
|
||||
|
||||
(define %libgcrypt
|
||||
#+(and libgcrypt
|
||||
(file-append libgcrypt "/lib/libgcrypt")))
|
||||
(define %libz
|
||||
#+(and zlib
|
||||
(file-append zlib "/lib/libz")))
|
||||
(define %libgcrypt
|
||||
#+(and libgcrypt
|
||||
(file-append libgcrypt "/lib/libgcrypt")))
|
||||
(define %libz
|
||||
#+(and zlib
|
||||
(file-append zlib "/lib/libz")))
|
||||
|
||||
(define %nix-instantiate ;for (guix import snix)
|
||||
"nix-instantiate")))))
|
||||
(define %nix-instantiate ;for (guix import snix)
|
||||
"nix-instantiate"))))
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue