From e076b8b88453a2880bc32daeae0bc774149eba92 Mon Sep 17 00:00:00 2001 From: Roman Scherer Date: Fri, 27 Sep 2024 11:14:44 +0200 Subject: [PATCH] =?UTF-8?q?installer:=20Use=20the=20latest=20=E2=80=98iso-?= =?UTF-8?q?codes=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/installer.scm (compute-locale-step): Use Use iso-codes. Change-Id: I9a69f7accee965cf5deb2c1b23ce3fda579d465a Signed-off-by: Ludovic Courtès Reported-by: Ricardo Wurmus --- gnu/installer.scm | 16 ++++++++++------ 1 file 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 @@ (define (compiled-file-loader file name) (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 @@ (define installer-builder ;; (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"