aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-12-11 17:29:41 +0100
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:42:48 +0200
commit3729099184d80119212bf707d0001b976e3b755e (patch)
tree7ea54c5e3605385831891c9b16b7e3eb311eae79
parentf645cf65c1fa64727aade341849d38776d46d518 (diff)
downloadguix-3729099184d80119212bf707d0001b976e3b755e.tar.gz
guix-3729099184d80119212bf707d0001b976e3b755e.zip
packages: Remove reference to ‘glibc-utf8-locales’ in ‘patch-and-repack’.
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
-rw-r--r--guix/packages.scm29
1 files changed, 12 insertions, 17 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index b2801bf403..0966b4a9de 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -916,13 +916,7 @@ identifiers. The result is inferred from the file names of patches."
("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 @@ specifies modules in scope when evaluating SNIPPET."
(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 @@ specifies modules in scope when evaluating SNIPPET."
;; 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"