From 85b81cf8c1fa79cc3929c5fadfabc1b9a47b77c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Oct 2015 10:19:42 +0200 Subject: packages: Use locales from the /X.Y sub-directory of the locale package. This is a followup to commit f2d7bbb. * guix/packages.scm (patch-and-repack)[build]: Append "/X.Y" to LOCPATH. --- guix/packages.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'guix/packages.scm') diff --git a/guix/packages.scm b/guix/packages.scm index 622cb0ac0c..68fb0916d8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -477,7 +477,10 @@ (define (first-file directory) (when #+locales ;; First of all, install a UTF-8 locale so that UTF-8 file names ;; are correctly interpreted. During bootstrap, LOCALES is #f. - (setenv "LOCPATH" (string-append #+locales "/lib/locale")) + (setenv "LOCPATH" + (string-append #+locales "/lib/locale/" + #+(and locales + (package-version locales)))) (setlocale LC_ALL "en_US.utf8")) (setenv "PATH" (string-append #+xz "/bin" ":" -- cgit v1.2.3