02/03: grafts: Use C.UTF-8 and remove dependency on ‘glibc-utf8-locales’.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 61fd3585f0b3bd4423572267588b2f9871989cda
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jan 25 22:31:35 2024 +0100

    grafts: Use C.UTF-8 and remove dependency on ‘glibc-utf8-locales’.
    
    This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.
    
    * guix/grafts.scm (graft-derivation/shallow)[glibc-locales]: Remove.
    [build]: Leave ‘GUIX_LOCPATH’ unset.  Use “C.UTF-8” instead of
    “en_US.utf8”.
    
    Reported-by: Janneke Nieuwenhuizen <janneke@gnu.org>
    Change-Id: I59bc90130c6711a1a89068fbf697f9bd2ba2b5f1
---
 guix/grafts.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/guix/grafts.scm b/guix/grafts.scm
index f4df513daf..d97e112ba4 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,12 +96,6 @@
   "Return a derivation called NAME, which applies GRAFTS to the specified
 OUTPUTS of DRV.  This procedure performs \"shallow\" grafting in that GRAFTS
 are not recursively applied to dependencies of DRV."
-  (define glibc-locales
-    (module-ref (resolve-interface '(gnu packages commencement))
-                (if (target-hurd? system)
-                    'glibc-utf8-locales-final/hurd
-                    'glibc-utf8-locales-final)))
-
   (define mapping
     ;; List of store item pairs.
     (map (lambda (graft)
@@ -114,11 +108,8 @@ are not recursively applied to dependencies of DRV."
 
   (define set-utf8-locale
     (and (%graft-with-utf8-locale?)
-         #~(begin
-             ;; Let Guile interpret file names as UTF-8.
-             (setenv "GUIX_LOCPATH"
-                     #+(file-append glibc-locales "/lib/locale"))
-             (setlocale LC_ALL "en_US.utf8"))))
+         ;; Let Guile interpret file names as UTF-8.
+         #~(setlocale LC_ALL "C.UTF-8")))
 
 
   (define build