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

packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’.

Browse source 
This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3.

* guix/packages.scm (%standard-patch-inputs): Remove “locales” entry.
(patch-and-repack): Remove ‘locales’ variable.
[build]: Remove reference to ‘locales’.  Use “C.UTF-8” unconditionally.

Change-Id: I54219b232880e05534599fbba8738cc00fb5d568
This commit is contained in:
Ludovic Courtès 2023-12-11 17:29:41 +01:00
parent f645cf65c1
commit 3729099184
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
guix/packages.scm
View file

@ -916,13 +916,7 @@ (define (%standard-patch-inputs system)
("gzip" ,(ref '(gnu packages compression) 'gzip))
("lzip" ,(ref '(gnu packages compression) 'lzip))
("unzip" ,(ref '(gnu packages compression) 'unzip))
("patch" ,(ref '(gnu packages base) 'patch/pinned))
("locales"
,(parameterize ((%current-target-system #f)
(%current-system system))
(canonical
((module-ref (resolve-interface '(gnu packages base))
'libc-utf8-locales-for-target))))))))
("patch" ,(ref '(gnu packages base) 'patch/pinned)))))
(define (default-guile)
"Return the default Guile package used to run the build code of
@ -1003,7 +997,6 @@ (define instantiate-patch
(lzip (lookup-input "lzip"))
(xz (lookup-input "xz"))
(patch (lookup-input "patch"))
(locales (lookup-input "locales"))
(comp (and=> (compressor source-file-name) lookup-input))
(patches (map instantiate-patch patches)))
(define build
@ -1065,15 +1058,17 @@ (define (repack directory output)
;; Encoding/decoding errors shouldn't be silent.
(fluid-set! %default-port-conversion-strategy 'error)
(when #+locales
;; First of all, install a UTF-8 locale so that UTF-8 file names
;; are correctly interpreted. During bootstrap, LOCALES is #f.
(setenv "LOCPATH"
(string-append #+locales "/lib/locale/"
#+(and locales
(version-major+minor
(package-version locales)))))
(setlocale LC_ALL "en_US.utf8"))
;; First of all, install a UTF-8 locale so that UTF-8 file names
;; are correctly interpreted. During bootstrap, locales are
;; missing.
(let ((locale "C.UTF-8"))
(catch 'system-error
(lambda ()
(setlocale LC_ALL locale))
(lambda args
(format (current-error-port)
"failed to install '~a' locale: ~a~%"
locale (system-error-errno args)))))
(setenv "PATH"
(string-append #+xz "/bin"