02/02: gnu: commencement: glibc-utf8-locales-final: Use locales-for-target.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 626155ea187ed9650f90aa6f30f725fb35caf023
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Jun 7 19:28:21 2023 +0200

    gnu: commencement: glibc-utf8-locales-final: Use locales-for-target.
    
    * gnu/packages/commencement.scm (glibc-utf8-locales-final): Change define to
    define/system-dependent.  Replace glibc-utf8-locales with
    libc-utf8-locales-for-target.
---
 gnu/packages/commencement.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 055e14ba68..fcda3ee5da 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3305,19 +3305,20 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
   (with-boot4 (hidden-package
                (package-with-bootstrap-guile guile-3.0/pinned))))
 
-(define-public glibc-utf8-locales-final
+(define/system-dependent glibc-utf8-locales-final
   ;; Now that we have GUILE-FINAL, build the UTF-8 locales.  They are needed
   ;; by the build processes afterwards so their 'scm_to_locale_string' works
   ;; with the full range of Unicode codepoints (remember
   ;; 'scm_to_locale_string' is called every time a string is passed to a C
   ;; function.)
-  (package
-    (inherit glibc-utf8-locales)
-    (properties `((hidden? . #t)
-                  ,@(package-properties glibc-utf8-locales)))
-    (native-inputs
-     `(("glibc" ,glibc-final)
-       ("gzip" ,(with-boot4 gzip))))))
+  (let ((locales (libc-utf8-locales-for-target)))
+    (package
+      (inherit locales)
+      (properties `((hidden? . #t)
+                    ,@(package-properties locales)))
+      (native-inputs
+       `(("glibc" ,glibc-final)
+         ("gzip" ,(with-boot4 gzip)))))))
 
 (define-public ld-wrapper
   ;; The final 'ld' wrapper, which uses the final Guile and Binutils.