diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-04 10:19:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-04 10:19:42 +0200 |
| commit | 85b81cf8c1fa79cc3929c5fadfabc1b9a47b77c3 (patch) | |
| tree | 5d9786588ae930780ac4ea93590b61a910c7454b /guix/packages.scm | |
| parent | afd3d9316ce3c48cd7f7dbae64be0f8bcb756ba6 (diff) | |
| download | guix-patches-85b81cf8c1fa79cc3929c5fadfabc1b9a47b77c3.tar guix-patches-85b81cf8c1fa79cc3929c5fadfabc1b9a47b77c3.tar.gz | |
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.
Diffstat (limited to 'guix/packages.scm')
| -rw-r--r-- | guix/packages.scm | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ 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" ":" |