mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: glibc-utf8-locales: Add the C.UTF-8 locale.
* gnu/packages/base.scm (%default-utf8-locales): Add "C". (make-glibc-utf8-locales): Delete "C" from LOCALES for glibc versions lower than or equal to 2.35. Change-Id: I6a6faa68dc18bf0f87c372109a17f476d3561278
This commit is contained in:
parent
b089f95f14
commit
6a554dbc0d
1 changed files with 10 additions and 2 deletions
|
@ -1454,7 +1454,8 @@ (define (locale-directory? file stat)
|
||||||
(define %default-utf8-locales
|
(define %default-utf8-locales
|
||||||
;; These are the locales commonly used for tests---e.g., in Guile's i18n
|
;; These are the locales commonly used for tests---e.g., in Guile's i18n
|
||||||
;; tests.
|
;; tests.
|
||||||
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
'("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
||||||
|
|
||||||
(define*-public (make-glibc-utf8-locales glibc #:key
|
(define*-public (make-glibc-utf8-locales glibc #:key
|
||||||
(locales %default-utf8-locales)
|
(locales %default-utf8-locales)
|
||||||
(name "glibc-utf8-locales"))
|
(name "glibc-utf8-locales"))
|
||||||
|
@ -1502,7 +1503,14 @@ (define file
|
||||||
(symlink (string-append locale ".utf8")
|
(symlink (string-append locale ".utf8")
|
||||||
(string-append localedir "/"
|
(string-append localedir "/"
|
||||||
locale ".UTF-8")))
|
locale ".UTF-8")))
|
||||||
'#$locales)))))
|
|
||||||
|
;; The C.UTF-8 locale was introduced in 2.35 but it
|
||||||
|
;; fails to build there:
|
||||||
|
;; <https://sourceware.org/bugzilla/show_bug.cgi?id=28861>.
|
||||||
|
'#$(if (version>? (package-version this-package)
|
||||||
|
"2.35")
|
||||||
|
locales
|
||||||
|
(delete "C" locales)))))))
|
||||||
(native-inputs (list glibc gzip))
|
(native-inputs (list glibc gzip))
|
||||||
(synopsis (if default-locales?
|
(synopsis (if default-locales?
|
||||||
(P_ "Small sample of UTF-8 locales")
|
(P_ "Small sample of UTF-8 locales")
|
||||||
|
|
Loading…
Reference in a new issue