From f2d7bbb537dd3e3fa3b0215549640d2d9c0aeaec Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 3 Oct 2015 18:02:30 +0200
Subject: gnu: glibc: Look for locale data in versioned sub-directories.

* gnu/packages/base.scm (glibc)[native-search-paths]: Add
  'lib/locale/VERSION' for 'GUIX_LOCPATH'.
  (glibc-locales, glibc-utf8-locales): Write to a VERSION
  sub-directory.
* guix/profiles.scm (ca-certificate-bundle): Adjust LOCPATH value
  accordingly.
---
 guix/profiles.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'guix')

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 0b417a64de..c56ebb145b 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -573,7 +573,9 @@ MANIFEST.  Single-file bundles are required by programs such as Git and Lynx."
 
         ;; Some file names in the NSS certificates are UTF-8 encoded so
         ;; install a UTF-8 locale.
-        (setenv "LOCPATH" (string-append #+glibc-utf8-locales "/lib/locale"))
+        (setenv "LOCPATH"
+                (string-append #+glibc-utf8-locales "/lib/locale/"
+                               #+(package-version glibc-utf8-locales)))
         (setlocale LC_ALL "en_US.UTF-8")
 
         (match (append-map ca-files '#$(manifest-inputs manifest))
-- 
cgit v1.2.3