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/profiles.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'guix/profiles.scm') 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 -- cgit v1.2.3