mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: Use ‘libc-utf8-locales-for-target’.
* guix/packages.scm (%standard-patch-inputs): Use ‘libc-utf8-locales-for-target’ instead of ‘glibc-utf8-locales’. * guix/self.scm (%packages): Likewise. * gnu/home/services/ssh.scm (file-join): Likewise * gnu/installer.scm (build-compiled-file): Likewise. * gnu/packages/chromium.scm (ungoogled-chromium/wayland): Likewise. * gnu/packages/gnome.scm (libgweather4, tracker): Likewise. * gnu/packages/javascript.scm (js-mathjax): Likewise. * gnu/packages/package-management.scm (guix, flatpak): Likewise. * gnu/packages/raspberry-pi.scm (raspi-arm64-chainloader): Likewise. * gnu/packages/suckless.scm (svkbd): Likewise. * gnu/services.scm (cleanup-gexp): Likewise. * gnu/services/base.scm (guix-publish-shepherd-service): Likewise. * gnu/services/guix.scm (guix-build-coordinator-shepherd-services) (guix-build-coordinator-agent-shepherd-services): Likewise. * gnu/services/guix.scm (guix-build-coordinator-queue-builds-shepherd-services): (guix-data-service-shepherd-services) (nar-herder-shepherd-services) (bffe-shepherd-services): Likewise. * gnu/services/web.scm (anonip-shepherd-service) (mumi-shepherd-services): Likewise. * gnu/system/image.scm (system-disk-image, system-iso9660-image) (system-docker-image, system-tarball-image): Likewise. * gnu/system/install.scm (%installation-services): Likewise. * guix/profiles.scm (info-dir-file): Likewise. (ca-certificate-bundle, profile-derivation): Likewise. * guix/scripts/pack.scm (store-database, set-utf8-locale): Likewise. * tests/pack.scm: Likewise. * tests/profiles.scm ("profile-derivation, cross-compilation"): Likewise. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Co-authored-by: Christopher Baines <mail@cbaines.net> Change-Id: I24239f427bcc930c29d2ba5d00dc615960a6c374
This commit is contained in:
parent
9442b53c6b
commit
b0715d7cd2
20 changed files with 97 additions and 56 deletions
|
@ -1000,8 +1000,9 @@ MANIFEST."
|
|||
(module-ref (resolve-interface '(gnu packages texinfo)) 'texinfo))
|
||||
(define gzip ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages compression)) 'gzip))
|
||||
(define glibc-utf8-locales ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages base)) 'glibc-utf8-locales))
|
||||
(define libc-utf8-locales-for-target ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages base))
|
||||
'libc-utf8-locales-for-target))
|
||||
|
||||
(define build
|
||||
(with-imported-modules '((guix build utils))
|
||||
|
@ -1043,7 +1044,8 @@ MANIFEST."
|
|||
|
||||
(setenv "PATH" (string-append #+gzip "/bin")) ;for info.gz files
|
||||
(setenv "GUIX_LOCPATH"
|
||||
#+(file-append glibc-utf8-locales "/lib/locale"))
|
||||
#+(file-append (libc-utf8-locales-for-target system)
|
||||
"/lib/locale"))
|
||||
|
||||
(mkdir-p (string-append #$output "/share/info"))
|
||||
(exit (every install-info
|
||||
|
@ -1124,8 +1126,9 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
|
|||
;; See <http://lists.gnu.org/archive/html/guix-devel/2015-02/msg00429.html>
|
||||
;; for a discussion.
|
||||
|
||||
(define glibc-utf8-locales ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages base)) 'glibc-utf8-locales))
|
||||
(define libc-utf8-locales-for-target ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages base))
|
||||
'libc-utf8-locales-for-target))
|
||||
|
||||
(define build
|
||||
(with-imported-modules '((guix build utils))
|
||||
|
@ -1159,9 +1162,11 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx."
|
|||
;; Some file names in the NSS certificates are UTF-8 encoded so
|
||||
;; install a UTF-8 locale.
|
||||
(setenv "LOCPATH"
|
||||
(string-append #+glibc-utf8-locales "/lib/locale/"
|
||||
(string-append #+(libc-utf8-locales-for-target system)
|
||||
"/lib/locale/"
|
||||
#+(version-major+minor
|
||||
(package-version glibc-utf8-locales))))
|
||||
(package-version
|
||||
(libc-utf8-locales-for-target system)))))
|
||||
(setlocale LC_ALL "en_US.utf8")
|
||||
|
||||
(match (append-map ca-files '#$(manifest-inputs manifest))
|
||||
|
@ -1999,19 +2004,21 @@ are cross-built for TARGET."
|
|||
(and (derivation? drv) (gexp-input drv)))
|
||||
extras))
|
||||
|
||||
(define glibc-utf8-locales ;lazy reference
|
||||
(define libc-utf8-locales-for-target ;lazy reference
|
||||
(module-ref (resolve-interface '(gnu packages base))
|
||||
'glibc-utf8-locales))
|
||||
'libc-utf8-locales-for-target))
|
||||
|
||||
(define set-utf8-locale
|
||||
;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so
|
||||
;; install a UTF-8 locale.
|
||||
#~(begin
|
||||
(setenv "LOCPATH"
|
||||
#$(file-append glibc-utf8-locales "/lib/locale/"
|
||||
(version-major+minor
|
||||
(package-version glibc-utf8-locales))))
|
||||
(setlocale LC_ALL "en_US.utf8")))
|
||||
(let ((locales (libc-utf8-locales-for-target
|
||||
(or system (%current-system)))))
|
||||
#~(begin
|
||||
(setenv "LOCPATH"
|
||||
#$(file-append locales "/lib/locale/"
|
||||
(version-major+minor
|
||||
(package-version locales))))
|
||||
(setlocale LC_ALL "en_US.utf8"))))
|
||||
|
||||
(define builder
|
||||
(with-imported-modules '((guix build profiles)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue