From 19206eee69e8c22d63104af1b7f1f815969bff7f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 10 Nov 2022 18:20:23 +0100
Subject: grafts: Run with a UTF-8 locale.

Fixes <https://issues.guix.gnu.org/55968>.
Reported by Maxime Devos <maximedevos@telenet.be>.

* guix/grafts.scm (%graft-with-utf8-locale?): New parameter.
(graft-derivation/shallow)[glibc-locales, set-utf8-locale]: New
variables.
[build]: Use 'set-utf8-locale'.
* tests/gexp.scm, tests/grafts.scm, tests/packages.scm: Set
'%graft-with-utf8-locale?' to #f.
---
 tests/gexp.scm     | 4 ++++
 tests/grafts.scm   | 5 ++++-
 tests/packages.scm | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/gexp.scm b/tests/gexp.scm
index 6d57ac5d7a..7a90f8dcbf 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -21,6 +21,7 @@ (define-module (test-gexp)
   #:use-module (guix store)
   #:use-module (guix monads)
   #:use-module (guix gexp)
+  #:use-module ((guix grafts) #:select (%graft-with-utf8-locale?))
   #:use-module (guix derivations)
   #:use-module (guix packages)
   #:use-module (guix build-system trivial)
@@ -49,6 +50,9 @@ (define %store
 ;; Globally disable grafts because they can trigger early builds.
 (%graft? #f)
 
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
 ;; For white-box testing.
 (define (gexp-inputs x)
   ((@@ (guix gexp) gexp-inputs) x))
diff --git a/tests/grafts.scm b/tests/grafts.scm
index 7e1959e4a7..63dbb13830 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2019, 2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -35,6 +35,9 @@ (define-module (test-grafts)
 (define %store
   (open-connection-for-tests))
 
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
 (define (bootstrap-binary name)
   (let ((bin (search-bootstrap-binary name (%current-system))))
     (and %store
diff --git a/tests/packages.scm b/tests/packages.scm
index a71eb1125d..a5819d8de3 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -75,6 +75,9 @@ (define %store
 ;; can trigger builds early.)
 (%graft? #f)
 
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
 
 (test-begin "packages")
 
-- 
cgit v1.2.3