cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix setting GUIX_LOCPATH when using open-inferior/container

Browse source
This commit is contained in:
Christopher Baines 2020-01-13 22:24:18 +00:00
parent 2062badf51
commit b43fe39ab8
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -794,6 +794,10 @@ WHERE job_id = $1"
(let* ((guix-locpath (getenv "GUIX_LOCPATH")) (let* ((guix-locpath (getenv "GUIX_LOCPATH"))
(inf (let ((guix-locpath (inf (let ((guix-locpath
;; Augment the GUIX_LOCPATH to include glibc-locales from
;; the Guix at store-path, this should mean that the
;; inferior Guix works, even if it's build using a different
;; glibc version
(string-append (string-append
(glibc-locales-for-guix-store-path store store-path) (glibc-locales-for-guix-store-path store store-path)
"/lib/locale" "/lib/locale"
@ -807,11 +811,6 @@ WHERE job_id = $1"
;; Guix (like the new (guix lint) module ;; Guix (like the new (guix lint) module
(unsetenv "GUILE_LOAD_PATH") (unsetenv "GUILE_LOAD_PATH")
(unsetenv "GUILE_LOAD_COMPILED_PATH") (unsetenv "GUILE_LOAD_COMPILED_PATH")
;; Augment the GUIX_LOCPATH to include glibc-locales from
;; the Guix at store-path, this should mean that the
;; inferior Guix works, even if it's build using a different
;; glibc version
(setenv "GUIX_LOCPATH" guix-locpath)
(simple-format (current-error-port) "debug: set GUIX_LOCPATH to ~A\n" (simple-format (current-error-port) "debug: set GUIX_LOCPATH to ~A\n"
guix-locpath) guix-locpath)
(if (defined? (if (defined?
@ -819,8 +818,13 @@ WHERE job_id = $1"
(resolve-module '(guix inferior))) (resolve-module '(guix inferior)))
(open-inferior/container store store-path (open-inferior/container store store-path
#:extra-shared-directories #:extra-shared-directories
'("/gnu/store")) '("/gnu/store")
#:extra-environment-variables
(list (string-append
"GUIX_LOCPATH="
guix-locpath)))
(begin (begin
(setenv "GUIX_LOCPATH" guix-locpath)
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior store-path (open-inferior store-path
#:error-port (real-error-port))))))) #:error-port (real-error-port)))))))