branch wip-hurd updated: Revert "gnu: commencement: glibc-utf8-locales-final: Use locales-for-target."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/wip-hurd by this push:
     new 3a030bf211 Revert "gnu: commencement: glibc-utf8-locales-final: Use 
locales-for-target."
3a030bf211 is described below

commit 3a030bf2110d848389d6f83ec7e07f79ff9aa650
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Jun 8 13:31:49 2023 +0200

    Revert "gnu: commencement: glibc-utf8-locales-final: Use 
locales-for-target."
    
    This gives
    
    --8<---------------cut here---------------start------------->8---
    In guix/git-download.scm:
        113:4  4 (git-fetch #<<git-reference> url: 
"https://github.com/wingo/f…> …)
    In ice-9/boot-9.scm:
      2858:12  3 (module-ref _ _ . _)
      1685:16  2 (raise-exception _ #:continuable? _)
      1685:16  1 (raise-exception _ #:continuable? _)
      1685:16  0 (raise-exception _ #:continuable? _)
    
    ice-9/boot-9.scm:1685:16: In procedure raise-exception:
    No variable named glibc-utf8-locales-final in #<interface (gnu packages 
commencement) 7f45ffae9a00>
    --8<---------------cut here---------------end--------------->8---
    
    This reverts commit c80d867dcea8ebddc2d81ba72fd0a7511f2e6032.
---
 gnu/packages/commencement.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fcda3ee5da..055e14ba68 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3305,20 +3305,19 @@ 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/system-dependent glibc-utf8-locales-final
+(define-public 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.)
-  (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)))))))
+  (package
+    (inherit glibc-utf8-locales)
+    (properties `((hidden? . #t)
+                  ,@(package-properties glibc-utf8-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.