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

self: Generated (guix config) honors %CURRENT-SYSTEM. 

Fixes <https://bugs.gnu.org/34468>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.

* guix/self.scm (%config-variables): Remove %SYSTEM.
(make-config.scm): Define '%system' to (%current-system).
This commit is contained in:
Ludovic Courtès 2019-02-16 23:51:01 +01:00
parent 41fa9f1815
commit 54eadc42d2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/self.scm
View File

@ -771,7 +771,7 @@ Info manual."
((_ variable rest ...) ((_ variable rest ...)
(cons `(variable . ,variable) (cons `(variable . ,variable)
(variables rest ...)))))) (variables rest ...))))))
(variables %localstatedir %storedir %sysconfdir %system))) (variables %localstatedir %storedir %sysconfdir)))
(define* (make-config.scm #:key zlib gzip xz bzip2 (define* (make-config.scm #:key zlib gzip xz bzip2
(package-name "GNU Guix") (package-name "GNU Guix")
@ -789,6 +789,7 @@ Info manual."
%guix-version %guix-version
%guix-bug-report-address %guix-bug-report-address
%guix-home-page-url %guix-home-page-url
%system
%store-directory %store-directory
%state-directory %state-directory
%store-database-directory %store-database-directory
@ -798,6 +799,9 @@ Info manual."
%bzip2 %bzip2
%xz)) %xz))
(define %system
#$(%current-system))
#$@(map (match-lambda #$@(map (match-lambda
((name . value) ((name . value)
#~(define-public #$name #$value))) #~(define-public #$name #$value)))