From 19206eee69e8c22d63104af1b7f1f815969bff7f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Nov 2022 18:20:23 +0100 Subject: grafts: Run with a UTF-8 locale. Fixes . Reported by Maxime Devos . * 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 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/gexp.scm') 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)) -- cgit v1.2.3