[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: services: guix: Run 'guix-daemon' in UTF-8 locale.
From: |
guix-commits |
Subject: |
01/02: services: guix: Run 'guix-daemon' in UTF-8 locale. |
Date: |
Sun, 9 Dec 2018 18:28:23 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 7e4bc215098f334bc2a11737f2665dd4992fc2da
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 10 00:13:17 2018 +0100
services: guix: Run 'guix-daemon' in UTF-8 locale.
Fixes <https://bugs.gnu.org/32942>.
Reported by Julien Lepiller <address@hidden>.
* gnu/services/base.scm (guix-shepherd-service) <start>: In
#:environment-variables, add "GUIX_LOCPATH" and "LC_ALL".
---
gnu/services/base.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 89e39f7..b10f5cb 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1604,7 +1604,15 @@ failed to register public key '~a': ~a~%" key
status)))))))
'())
#$@(if tmpdir
(list (string-append "TMPDIR=" tmpdir))
- '()))
+ '())
+
+ ;; Make sure we run in a UTF-8 locale so that 'guix
+ ;; offload' correctly restores nars that contain UTF-8
+ ;; file names such as 'nss-certs'. See
+ ;; <https://bugs.gnu.org/32942>.
+ (string-append "GUIX_LOCPATH="
+ #$glibc-utf8-locales "/lib/locale")
+ "LC_ALL=en_US.utf8")
#:log-file #$log-file))
(stop #~(make-kill-destructor))))))