From a42d54039bde144175352cc85342f809e025e933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 25 Jan 2024 22:31:35 +0100 Subject: [PATCH] =?UTF-8?q?grafts:=20Use=20C.UTF-8=20and=20remove=20depend?= =?UTF-8?q?ency=20on=20=E2=80=98glibc-utf8-locales=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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 f4df513daf9..d97e112ba43 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 +;;; Copyright © 2014-2024 Ludovic Courtès ;;; ;;; 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