[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: Use libc-locales-for-target
From: |
Christopher Baines |
Subject: |
05/05: Use libc-locales-for-target |
Date: |
Tue, 5 Dec 2023 16:11:12 -0500 (EST) |
cbaines pushed a commit to branch master
in repository data-service.
commit 241d7e4889e4b3d8a042cd2348004ccc19d6fc1d
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Mon Dec 4 11:11:39 2023 +0000
Use libc-locales-for-target
To help find the right glibc-locales to use.
---
guix-data-service/jobs/load-new-guix-revision.scm | 24 ++++++++++++++++++-----
1 file 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"