From c6bc8e22e9b02a40280a5a1cf3792647755b67bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 3 Dec 2017 02:32:16 +0100 Subject: gnu: glibc: Don't use full version string in locale path. This is a follow-up to commit ee3ebf1a357bd4eb36a2fa1790a7b549cffb305a. Fixes . * 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. --- guix/packages.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'guix/packages.scm') 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" ":" -- cgit v1.2.3