[bug#67824] [PATCH core-updates v2 4/9] profiles: Use C.UTF-8 instead of ‘glibc-utf8-locales’ where possible.

[Ludovic Courtès]

This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.

* guix/profiles.scm (ca-certificate-bundle)[libc-utf8-locales-for-target]:
Remove.
[build]: Use “C.UTF-8” instead of “en_US.utf8”.
(profile-derivation)[libc-utf8-locales-for-target]: Remove.
[set-utf8-locale]: Rewrite to a gexp that calls ‘setlocale’ for “C.UTF-8”.
* tests/profiles.scm ("profile-derivation, cross-compilation"): Remove
‘locales’ variable and related check.

Change-Id: I7cb148b9149fe5fbe5b9b1b25fdce1002ad1f37e
---
 guix/profiles.scm  | 33 +++++----------------------------
 tests/profiles.scm |  7 +------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index ce2f8337bf..da7790d819 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1125,11 +1125,6 @@ (define* (ca-certificate-bundle manifest #:optional 
system)
 MANIFEST.  Single-file bundles are required by programs such as Git and Lynx."
   ;; See <http://lists.gnu.org/archive/html/guix-devel/2015-02/msg00429.html>
   ;; for a discussion.
-
-  (define libc-utf8-locales-for-target  ;lazy reference
-    (module-ref (resolve-interface '(gnu packages base))
-                'libc-utf8-locales-for-target))
-
   (define build
     (with-imported-modules '((guix build utils))
       #~(begin
@@ -1161,13 +1156,7 @@ (define* (ca-certificate-bundle manifest #:optional 
system)
 
           ;; Some file names in the NSS certificates are UTF-8 encoded so
           ;; install a UTF-8 locale.
-          (setenv "LOCPATH"
-                  (string-append #+(libc-utf8-locales-for-target system)
-                                 "/lib/locale/"
-                                 #+(version-major+minor
-                                    (package-version
-                                     (libc-utf8-locales-for-target system)))))
-          (setlocale LC_ALL "en_US.utf8")
+          (setlocale LC_ALL "C.UTF-8")
 
           (match (append-map ca-files '#$(manifest-inputs manifest))
             (()
@@ -1960,8 +1949,7 @@ (define* (profile-derivation manifest
 or TARGET is set, raise an error if MANIFEST contains a package that does not
 support SYSTEM.
 
-When LOCALES? is true, the build is performed under a UTF-8 locale; this adds
-a dependency on the 'glibc-utf8-locales' package.
+When LOCALES? is true, the build is performed under a UTF-8 locale.
 
 When RELATIVE-SYMLINKS? is true, use relative file names for symlink targets.
 This is one of the things to do for the result to be relocatable.
@@ -2004,21 +1992,10 @@ (define* (profile-derivation manifest
                     (and (derivation? drv) (gexp-input drv)))
                   extras))
 
-    (define libc-utf8-locales-for-target ;lazy reference
-      (module-ref (resolve-interface '(gnu packages base))
-                  'libc-utf8-locales-for-target))
-
     (define set-utf8-locale
-      ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so
-      ;; install a UTF-8 locale.
-      (let ((locales (libc-utf8-locales-for-target
-                      (or system (%current-system)))))
-        #~(begin
-            (setenv "LOCPATH"
-                    #$(file-append locales "/lib/locale/"
-                                   (version-major+minor
-                                    (package-version locales))))
-            (setlocale LC_ALL "en_US.utf8"))))
+      ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so install a
+      ;; UTF-8 locale.  Assume libc comes with a copy of C.UTF-8.
+      #~(setlocale LC_ALL "C.UTF-8"))
 
     (define builder
       (with-imported-modules '((guix build profiles)
diff --git a/tests/profiles.scm b/tests/profiles.scm
index ddd6d74f3b..e448137cff 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -463,7 +463,6 @@ (define glibc
        (target ->   "arm-linux-gnueabihf")
        (grep        (package->cross-derivation packages:grep target))
        (sed         (package->cross-derivation packages:sed target))
-       (locales     (package->derivation 
(packages:libc-utf8-locales-for-target)))
        (drv         (profile-derivation manifest
                                         #:hooks '()
                                         #:locales? #t
@@ -475,15 +474,11 @@ (define glibc
                  (and (string-suffix? name input) input)))
              (derivation-inputs drv))))
 
-    ;; The inputs for grep and sed should be cross-build derivations, but that
-    ;; for the glibc-utf8-locales should be a native build.
     (return (and (string=? (derivation-system drv) (%current-system))
                  (string=? (find-input packages:grep)
                            (derivation-file-name grep))
                  (string=? (find-input packages:sed)
-                           (derivation-file-name sed))
-                 (string=? (find-input (packages:libc-utf8-locales-for-target))
-                           (derivation-file-name locales))))))
+                           (derivation-file-name sed))))))
 
 (test-assert "package->manifest-entry defaults to \"out\""
   (let ((outputs (package-outputs packages:glibc)))
-- 
2.41.0