nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

self: Remove 'eval-when' from in generated (guix config). 

* guix/self.scm (make-config.scm): Remove unneeded 'eval-when'.
This commit is contained in:
Ludovic Courtès 2018-04-11 00:22:03 +02:00
parent f8fbe37654
commit 63cab4182d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
guix/self.scm
View File

@ -399,45 +399,43 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
%xz %xz
%nix-instantiate)) %nix-instantiate))
;; XXX: Work around <http://bugs.gnu.org/15602>. #$@(map (match-lambda
(eval-when (expand load eval) ((name . value)
#$@(map (match-lambda #~(define-public #$name #$value)))
((name . value) %config-variables)
#~(define-public #$name #$value)))
%config-variables)
(define %guix-package-name #$package-name) (define %guix-package-name #$package-name)
(define %guix-version #$package-version) (define %guix-version #$package-version)
(define %guix-bug-report-address #$bug-report-address) (define %guix-bug-report-address #$bug-report-address)
(define %guix-home-page-url #$home-page-url) (define %guix-home-page-url #$home-page-url)
(define %sbindir (define %sbindir
;; This is used to define '%guix-register-program'. ;; This is used to define '%guix-register-program'.
;; TODO: Use a derivation that builds nothing but the ;; TODO: Use a derivation that builds nothing but the
;; C++ part. ;; C++ part.
#+(and guix (file-append guix "/sbin"))) #+(and guix (file-append guix "/sbin")))
(define %guix-register-program (define %guix-register-program
(or (getenv "GUIX_REGISTER") (or (getenv "GUIX_REGISTER")
(and %sbindir (and %sbindir
(string-append %sbindir "/guix-register")))) (string-append %sbindir "/guix-register"))))
(define %gzip (define %gzip
#+(and gzip (file-append gzip "/bin/gzip"))) #+(and gzip (file-append gzip "/bin/gzip")))
(define %bzip2 (define %bzip2
#+(and bzip2 (file-append bzip2 "/bin/bzip2"))) #+(and bzip2 (file-append bzip2 "/bin/bzip2")))
(define %xz (define %xz
#+(and xz (file-append xz "/bin/xz"))) #+(and xz (file-append xz "/bin/xz")))
(define %libgcrypt (define %libgcrypt
#+(and libgcrypt #+(and libgcrypt
(file-append libgcrypt "/lib/libgcrypt"))) (file-append libgcrypt "/lib/libgcrypt")))
(define %libz (define %libz
#+(and zlib #+(and zlib
(file-append zlib "/lib/libz"))) (file-append zlib "/lib/libz")))
(define %nix-instantiate ;for (guix import snix) (define %nix-instantiate ;for (guix import snix)
"nix-instantiate"))))) "nix-instantiate"))))