ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

git-download: Use C.UTF-8 and remove dependency on ‘glibc-utf8-locales’.

Browse source 
This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.

* guix/git-download.scm (git-fetch/in-band*)[glibc-locales]: Remove.
[build]: Leave ‘GUIX_LOCPATH’ unset.  Use “C.UTF-8” instead of
“en_US.utf8”.

Change-Id: I268361c04dd2d6154d97836b1f41ff06ffd278eb
This commit is contained in:
Ludovic Courtès 2024-01-25 22:26:16 +01:00
parent f719373583
commit c4ceb60f74
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/git-download.scm
View file

@ -115,12 +115,6 @@ (define guile-lzlib
(define gnutls (define gnutls
(module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls))
(define glibc-locales
;; Note: pick the '-final' variant to avoid circular dependency on
;; i586-gnu, where 'glibc-utf8-locales' indirectly depends on Git.
(module-ref (resolve-interface '(gnu packages commencement))
'glibc-utf8-locales-final))
(define modules (define modules
(delete '(guix config) (delete '(guix config)
(source-module-closure '((guix build git) (source-module-closure '((guix build git)
@ -145,9 +139,7 @@ (define recursive?
;; Let Guile interpret file names as UTF-8, otherwise ;; Let Guile interpret file names as UTF-8, otherwise
;; 'delete-file-recursively' might fail to delete all of ;; 'delete-file-recursively' might fail to delete all of
;; '.git'--see <https://issues.guix.gnu.org/54893>. ;; '.git'--see <https://issues.guix.gnu.org/54893>.
(setenv "GUIX_LOCPATH" (setlocale LC_ALL "C.UTF-8")
#+(file-append glibc-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8")
;; The 'git submodule' commands expects Coreutils, sed, grep, ;; The 'git submodule' commands expects Coreutils, sed, grep,
;; etc. to be in $PATH. This also ensures that git extensions are ;; etc. to be in $PATH. This also ensures that git extensions are