[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: glibc-utf8-locales: Use the normalized codeset.
|
From: |
Ludovic Courtès |
|
Subject: |
04/05: gnu: glibc-utf8-locales: Use the normalized codeset. |
|
Date: |
Sat, 03 Oct 2015 22:11:33 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 8a55e217ad3a6af96f9e05eb676616224fde509f
Author: Ludovic Courtès <address@hidden>
Date: Sat Oct 3 20:06:24 2015 +0200
gnu: glibc-utf8-locales: Use the normalized codeset.
* gnu/packages/base.scm (glibc-utf8-locales)[argument]: Use the
normalized codeset by default.
---
gnu/packages/base.scm | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 80b0332..c6abf56 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -689,12 +689,22 @@ the 'share/locale' sub-directory of this package.")
(mkdir-p localedir)
(every (lambda (locale)
- (zero? (system* "localedef" "--no-archive"
- "--prefix" localedir "-i" locale
- "-f" "UTF-8"
+ (define file
+ ;; Use the "normalized codeset" by
+ ;; default--e.g., "en_US.utf8".
+ (string-append localedir "/" locale ".utf8"))
+
+ (and (zero? (system* "localedef" "--no-archive"
+ "--prefix" localedir
+ "-i" locale
+ "-f" "UTF-8" file))
+ (begin
+ ;; For backward compatibility with Guix
+ ;; <= 0.8.3, add "xx_YY.UTF-8".
+ (symlink (string-append locale ".utf8")
(string-append localedir "/"
- locale
- ".UTF-8"))))
+ locale ".UTF-8"))
+ #t)))
;; These are the locales commonly used for
;; tests---e.g., in Guile's i18n tests.