diff options
| author | Roman Scherer <roman@burningswell.com> | 2024-09-27 11:14:44 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-09-28 12:55:54 +0200 |
| commit | e076b8b88453a2880bc32daeae0bc774149eba92 (patch) | |
| tree | a57dc25467172262b83024dcf9b6ea9c33145ba2 | |
| parent | 2ae666c471fae8a30cb66fdfd47420ff871d89a9 (diff) | |
| download | guix-e076b8b88453a2880bc32daeae0bc774149eba92.tar guix-e076b8b88453a2880bc32daeae0bc774149eba92.tar.gz | |
installer: Use the latest ‘iso-codes’.
Fixes <https://issues.guix.gnu.org/73081>.
* gnu/installer.scm (compute-locale-step): Use Use iso-codes.
Change-Id: I9a69f7accee965cf5deb2c1b23ce3fda579d465a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Reported-by: Ricardo Wurmus <rekado@elephly.net>
| -rw-r--r-- | gnu/installer.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 53af01261e..5cd99e4013 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -146,10 +146,14 @@ been performed at build time." (let* ((supported-locales #~(supported-locales->locales #+(glibc-supported-locales))) - (iso-codes #~(string-append #$iso-codes/pinned "/share/iso-codes/json/")) - (iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json")) - (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json")) - (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json")) + + ;; Note: Use the latest version of 'iso-codes', including + ;; Guix-specific changes, so that all languages known to glibc and + ;; returned by 'glibc-supported-locales'. + (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/")) + (iso639-3 #~(string-append #$iso-codes "iso_639-3.json")) + (iso639-5 #~(string-append #$iso-codes "iso_639-5.json")) + (iso3166 #~(string-append #$iso-codes "iso_3166-1.json")) (locales-file (build-compiled-file locales-name #~`(quote ,#$supported-locales))) @@ -437,9 +441,9 @@ purposes." ;; (e.g., "French" is always displayed as "français", but ;; "Belgium" could be translated to Dutch, French, or German.) (bindtextdomain "iso_639-3" ;languages - #+(file-append iso-codes/pinned "/share/locale")) + #+(file-append iso-codes "/share/locale")) (bindtextdomain "iso_3166-1" ;territories - #+(file-append iso-codes/pinned "/share/locale")) + #+(file-append iso-codes "/share/locale")) ;; Likewise for XKB keyboard layout names. (bindtextdomain "xkeyboard-config" |