diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-16 23:51:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-17 00:04:57 +0100 |
| commit | 54eadc42d2a5ef748a7f007516cd3d56ca17c07e (patch) | |
| tree | f70ba43abaf4ce2b5985b9c4a49664b153eb6c6b /guix | |
| parent | 41fa9f1815685ede0d3fdc1c561d2a9cf0ffb158 (diff) | |
| download | gnu-guix-54eadc42d2a5ef748a7f007516cd3d56ca17c07e.tar gnu-guix-54eadc42d2a5ef748a7f007516cd3d56ca17c07e.tar.gz | |
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).
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/self.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index bcf04a1b28..ccff9be5b3 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -771,7 +771,7 @@ Info manual." ((_ variable rest ...) (cons `(variable . ,variable) (variables rest ...)))))) - (variables %localstatedir %storedir %sysconfdir %system))) + (variables %localstatedir %storedir %sysconfdir))) (define* (make-config.scm #:key zlib gzip xz bzip2 (package-name "GNU Guix") @@ -789,6 +789,7 @@ Info manual." %guix-version %guix-bug-report-address %guix-home-page-url + %system %store-directory %state-directory %store-database-directory @@ -798,6 +799,9 @@ Info manual." %bzip2 %xz)) + (define %system + #$(%current-system)) + #$@(map (match-lambda ((name . value) #~(define-public #$name #$value))) |