me
/
guix
Archived
1
0
Fork 0
Code

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
Christopher Baines 2023-12-13 12:48:48 +00:00
parent cbe64c316d
commit e3faf52c92
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/package-management.scm
View File

@ -1570,6 +1570,9 @@ environments.")
,@(or (and=> (assoc-ref inputs "sqitch") ,@(or (and=> (assoc-ref inputs "sqitch")
list) list)
'()))) '())))
`("GUIX_LOCPATH" ":" prefix
(,(string-append (assoc-ref inputs "glibc-utf8-locales")
"/lib/locale")))
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,scm ,(string-join (,scm ,(string-join
(map (lambda (input) (map (lambda (input)
@ -1608,6 +1611,7 @@ environments.")
(list (first (assoc-ref (package-native-inputs guix) "guile")) (list (first (assoc-ref (package-native-inputs guix) "guile"))
sqlite sqlite
bash-minimal bash-minimal
(libc-utf8-locales-for-target)
sqitch)) sqitch))
(propagated-inputs (propagated-inputs
(list guile-prometheus (list guile-prometheus
@ -1647,7 +1651,8 @@ outputs of those builds.")
(first (assoc-ref (package-native-inputs guix) "guile")))) (first (assoc-ref (package-native-inputs guix) "guile"))))
(inputs (inputs
(list (first (assoc-ref (package-native-inputs guix) "guile")) (list (first (assoc-ref (package-native-inputs guix) "guile"))
bash-minimal)) bash-minimal
(libc-utf8-locales-for-target)))
(propagated-inputs (propagated-inputs
(list guile-prometheus (list guile-prometheus
guile-gcrypt guile-gcrypt

10
gnu/services/guix.scm
View File

@ -342,10 +342,7 @@
;; Allow time for migrations to run ;; Allow time for migrations to run
#:pid-file-timeout 60 #:pid-file-timeout 60
#:environment-variables #:environment-variables
`(,(string-append `("LC_ALL=en_US.utf8"
"GUIX_LOCPATH="
#$(libc-utf8-locales-for-target) "/lib/locale")
"LC_ALL=en_US.utf8"
"PATH=/run/current-system/profile/bin" ; for hooks "PATH=/run/current-system/profile/bin" ; for hooks
#$@extra-environment-variables) #$@extra-environment-variables)
#:log-file "/var/log/guix-build-coordinator/coordinator.log") #:log-file "/var/log/guix-build-coordinator/coordinator.log")
@ -470,10 +467,7 @@
(or systems '()))) (or systems '())))
#:user #$user #:user #$user
#:environment-variables #:environment-variables
`(,(string-append `(;; XDG_CACHE_HOME is used by Guix when caching narinfo files
"GUIX_LOCPATH="
#$(libc-utf8-locales-for-target) "/lib/locale")
;; XDG_CACHE_HOME is used by Guix when caching narinfo files
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent" "XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
"LC_ALL=en_US.utf8") "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/agent.log")))) #:log-file "/var/log/guix-build-coordinator/agent.log"))))