01/02: packages: Use locales from the /X.Y sub-directory of the locale package.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 85b81cf8c1fa79cc3929c5fadfabc1b9a47b77c3
Author: Ludovic Courtès <address@hidden>
Date:   Sun Oct 4 10:19:42 2015 +0200

    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 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 622cb0a..68fb091 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -477,7 +477,10 @@ IMPORTED-MODULES specify modules to use/import for use by 
SNIPPET."
           (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" ":"