diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-03 02:32:16 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-03 16:23:43 +0100 |
| commit | c6bc8e22e9b02a40280a5a1cf3792647755b67bb (patch) | |
| tree | 7818e0f8b6b947f9f3c6d788955bd190a637069f /guix | |
| parent | 371193ecbfa3e4e41a7f0e380f7f15c485806e73 (diff) | |
gnu: glibc: Don't use full version string in locale path.
This is a follow-up to commit ee3ebf1a357bd4eb36a2fa1790a7b549cffb305a.
Fixes <https://bugs.gnu.org/29537>.
* gnu/packages/base.scm (glibc/linux)[version]: Change to 2.26.91-gaaa2eb83b8.
[source](uri): Adjust accordingly.
[arguments]: Use VERSION-MAJOR+MINOR for locales path.
(glibc-locales, glibc-utf8-locales): Likewise.
* guix/packages.scm (patch-and-repack): Likewise.
* guix/profiles.scm (ca-certificate-bundle, profile-derivation): Likewise.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/packages.scm | 3 | ||||
| -rw-r--r-- | guix/profiles.scm | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index f619d9b370..35f9b685a3 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -538,7 +538,8 @@ specifies modules in scope when evaluating SNIPPET." (setenv "LOCPATH" (string-append #+locales "/lib/locale/" #+(and locales - (package-version locales)))) + (version-major+minor + (package-version locales))))) (setlocale LC_ALL "en_US.utf8")) (setenv "PATH" (string-append #+xz "/bin" ":" diff --git a/guix/profiles.scm b/guix/profiles.scm index 0eb99f40de..51c330b323 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -812,7 +812,8 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx." ;; install a UTF-8 locale. (setenv "LOCPATH" (string-append #+glibc-utf8-locales "/lib/locale/" - #+(package-version glibc-utf8-locales))) + #+(version-major+minor + (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8") (match (append-map ca-files '#$(manifest-inputs manifest)) @@ -1256,7 +1257,8 @@ are cross-built for TARGET." #~(begin (setenv "LOCPATH" #$(file-append glibc-utf8-locales "/lib/locale/" - (package-version glibc-utf8-locales))) + (version-major+minor + (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8"))) (define builder |