[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: services: guix-publish: Run in a UTF-8 locale.
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: services: guix-publish: Run in a UTF-8 locale. |
|
Date: |
Thu, 27 Jul 2017 08:53:34 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 412701b0e5e073e6767eed162c14698db99df69c
Author: Ludovic Courtès <address@hidden>
Date: Thu Jul 27 14:48:38 2017 +0200
services: guix-publish: Run in a UTF-8 locale.
Works around <https://bugs.gnu.org/26948>.
* gnu/services/base.scm (guix-publish-shepherd-service): Pass
#:environment-variables to 'make-forkexec-constructor'.
---
gnu/services/base.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 813535e..e28e0d7 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -37,7 +37,7 @@
#:use-module ((gnu packages linux)
#:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2
rng-tools))
#:use-module ((gnu packages base)
- #:select (canonical-package glibc))
+ #:select (canonical-package glibc glibc-utf8-locales))
#:use-module (gnu packages bash)
#:use-module (gnu packages package-management)
#:use-module (gnu packages linux)
@@ -1499,7 +1499,15 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
#~())
#$@(if cache
#~((string-append "--cache=" #$cache))
- #~()))))
+ #~()))
+
+ ;; Make sure we run in a UTF-8 locale so we can produce
+ ;; nars for packages that contain UTF-8 file names such
+ ;; as 'nss-certs'. See <https://bugs.gnu.org/26948>.
+ #:environment-variables
+ (list (string-append "GUIX_LOCPATH="
+ #$glibc-utf8-locales "/lib/locale")
+ "LC_ALL=en_US.utf8")))
(stop #~(make-kill-destructor)))))))
(define %guix-publish-accounts