diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-12 22:00:52 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-12 22:00:52 +0100 |
| commit | 12878d12acccf83ef3258a53a01f851088f0aa9e (patch) | |
| tree | 47f875b50bd7714251256475317e96f4e6d73f55 /gnu/services | |
| parent | 17c3e0d85d9c1a6b4c09d09dd9238297b6165a2f (diff) | |
| parent | 7b046b1bdc0b1cbc50428d4e08136a110f0a12af (diff) | |
| download | guix-12878d12acccf83ef3258a53a01f851088f0aa9e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 89e39f7690..b10f5cbaf1 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)))))) |