diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-12-04 11:11:39 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-12-04 11:11:39 +0000 |
| commit | 241d7e4889e4b3d8a042cd2348004ccc19d6fc1d (patch) | |
| tree | e8696c6e12280fbdfc33a7d1ee87ac8bd99e9bb9 /guix-data-service | |
| parent | 8a8dccf2d8e188191abe8064cdbcee845f5953ab (diff) | |
| download | data-service-241d7e4889e4b3d8a042cd2348004ccc19d6fc1d.tar data-service-241d7e4889e4b3d8a042cd2348004ccc19d6fc1d.tar.gz | |
Use libc-locales-for-target
To help find the right glibc-locales to use.
Diffstat (limited to 'guix-data-service')
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index f70abc9..a8ef88b 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -1110,11 +1110,25 @@ inf) (inferior-eval '(when (defined? '%graft?) (%graft? #f)) inf) - (let* ((inferior-glibc-locales - (first - (lookup-inferior-packages inf "glibc-locales"))) - (derivation (inferior-package-derivation store - inferior-glibc-locales)) + (let* ((derivation + (or + (and=> + (inferior-eval-with-store + inf + store + '(lambda (store) + (and (defined? + 'libc-locales-for-target + (resolve-module '(gnu packages base))) + (derivation-file-name + (package-derivation + store + ((@ (gnu packages base) libc-locales-for-target))))))) + read-derivation-from-file) + (inferior-package-derivation + store + (first + (lookup-inferior-packages inf "glibc-locales"))))) (output (derivation->output-path derivation))) (close-inferior inf) (with-time-logging "building the glibc-locales derivation" |