diff options
author | Christopher Baines <mail@cbaines.net> | 2023-12-13 12:48:48 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2023-12-22 16:41:44 +0000 |
commit | e3faf52c9246bce52d1b9f817ee4a9243b7fb644 (patch) | |
tree | 9d244fc90df0608aca5ebf283915f5a932758d02 /gnu/packages | |
parent | cbe64c316dda4307d8ae47ca9f696ff874fb4e28 (diff) | |
download | guix-e3faf52c9246bce52d1b9f817ee4a9243b7fb644.tar.gz guix-e3faf52c9246bce52d1b9f817ee4a9243b7fb644.zip |
services: guix: Move GUIX_LOCPATH handling to packages.
I think this might be better than handling it in the service. I'm seeing
locale issues on the hurd which I hope this will address.
* gnu/packages/package-management.scm (guix-build-coordinator,
guix-build-coordinator/agent-only):
* gnu/services/guix.scm (guix-build-coordinator-shepherd-services,
guix-build-coordinator-agent-shepherd-services):
Change-Id: I07ca424f434854176326a19177dc5573d53b59c2
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/package-management.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 30216f518a..e73c142236 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1570,6 +1570,9 @@ environments.") ,@(or (and=> (assoc-ref inputs "sqitch") list) '()))) + `("GUIX_LOCPATH" ":" prefix + (,(string-append (assoc-ref inputs "glibc-utf8-locales") + "/lib/locale"))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(string-join (map (lambda (input) @@ -1608,6 +1611,7 @@ environments.") (list (first (assoc-ref (package-native-inputs guix) "guile")) sqlite bash-minimal + (libc-utf8-locales-for-target) sqitch)) (propagated-inputs (list guile-prometheus @@ -1647,7 +1651,8 @@ outputs of those builds.") (first (assoc-ref (package-native-inputs guix) "guile")))) (inputs (list (first (assoc-ref (package-native-inputs guix) "guile")) - bash-minimal)) + bash-minimal + (libc-utf8-locales-for-target))) (propagated-inputs (list guile-prometheus guile-gcrypt |