diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-03 07:20:53 +0100 |
| commit | 4c323c2f8308bba0e3295f3109d159c7b8f72838 (patch) | |
| tree | 7064e51dfec301c660cc97d83ffa041e011baadd /gnu/services/base.scm | |
| parent | 260b054aeaa0739bed1637742b6094c97dab47f2 (diff) | |
| parent | 06ebc45e15f2a1bd4526a5a716eed657c902a0c1 (diff) | |
| download | guix-4c323c2f8308bba0e3295f3109d159c7b8f72838.tar guix-4c323c2f8308bba0e3295f3109d159c7b8f72838.tar.gz | |
Merge branch 'master' into HEAD
Change-Id: I3f5d121162d98ef2ae61a62c4da3b0fd19d864e8
Diffstat (limited to 'gnu/services/base.scm')
| -rw-r--r-- | gnu/services/base.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 154e3079d3..ab66b12255 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -63,7 +63,9 @@ #:use-module (gnu packages bash) #:use-module ((gnu packages base) #:select (coreutils glibc glibc/hurd - glibc-utf8-locales make-glibc-utf8-locales + glibc-utf8-locales + libc-utf8-locales-for-target + make-glibc-utf8-locales tar canonical-package)) #:use-module ((gnu packages compression) #:select (gzip)) #:use-module (gnu packages fonts) @@ -2152,7 +2154,8 @@ raise a deprecation warning if the 'compression-level' field was used." ;; nars for packages that contain UTF-8 file names such ;; as 'nss-certs'. See <https://bugs.gnu.org/26948>. (list (string-append "GUIX_LOCPATH=" - #$glibc-utf8-locales "/lib/locale") + #$(libc-utf8-locales-for-target) + "/lib/locale") "LC_ALL=en_US.utf8") #:log-file "/var/log/guix-publish.log")) (endpoints #~(let ((ai (false-if-exception |