From 54eadc42d2a5ef748a7f007516cd3d56ca17c07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 16 Feb 2019 23:51:01 +0100
Subject: 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).
---
 guix/self.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'guix/self.scm')

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)))
-- 
cgit v1.2.3