amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc: Don't use full version string in locale path.

Browse source 
This is a follow-up to commit ee3ebf1a35.
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.
This commit is contained in:
Marius Bakke 2017-12-03 02:32:16 +01:00
parent 371193ecbf
commit c6bc8e22e9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
guix/profiles.scm
View file

@ -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