diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-01-13 22:24:18 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-01-13 22:24:18 +0000 |
| commit | b43fe39ab89fd226bd1512bbbb8ea68ff9d1ad84 (patch) | |
| tree | cc1736c671c131c15e341585df49c1eb62a10cee | |
| parent | 2062badf5167d942c0eb96d7ca73e0906de7e36b (diff) | |
| download | data-service-b43fe39ab89fd226bd1512bbbb8ea68ff9d1ad84.tar data-service-b43fe39ab89fd226bd1512bbbb8ea68ff9d1ad84.tar.gz | |
Fix setting GUIX_LOCPATH when using open-inferior/container
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 457f6cb..c53c282 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -794,6 +794,10 @@ WHERE job_id = $1" (let* ((guix-locpath (getenv "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 (glibc-locales-for-guix-store-path store store-path) "/lib/locale" @@ -807,11 +811,6 @@ WHERE job_id = $1" ;; Guix (like the new (guix lint) module (unsetenv "GUILE_LOAD_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" guix-locpath) (if (defined? @@ -819,8 +818,13 @@ WHERE job_id = $1" (resolve-module '(guix inferior))) (open-inferior/container store store-path #:extra-shared-directories - '("/gnu/store")) + '("/gnu/store") + #:extra-environment-variables + (list (string-append + "GUIX_LOCPATH=" + guix-locpath))) (begin + (setenv "GUIX_LOCPATH" guix-locpath) (simple-format #t "debug: using open-inferior\n") (open-inferior store-path #:error-port (real-error-port))))))) |