diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-12-11 11:50:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:49 +0200 |
| commit | 92727f4af5d410b0a521d57d5ecef6b35779bdc2 (patch) | |
| tree | a8cf6ae7a71cea1d639524c1b1c4fa84eda55b5c /gnu/packages/base.scm | |
| parent | 5b3e996d2980cf6549264ae111f36598efc91114 (diff) | |
| download | guix-92727f4af5d410b0a521d57d5ecef6b35779bdc2.tar.gz guix-92727f4af5d410b0a521d57d5ecef6b35779bdc2.zip | |
gnu: commencement: Remove ‘glibc-utf8-locales’ from ‘%final-inputs’.
* gnu/packages/commencement.scm (%boot5-inputs): Make an alias for
‘%boot4-inputs’.
(with-boot5): Turn into an alias for ‘with-boot4’.
(%final-inputs): Override ‘native-inputs’ of GAWK. Remove "locales"
entry.
(canonical-package): Add “glibc-utf8-locales” entry.
* gnu/packages/base.scm (libc-utf8-locales-for-target): Use
‘canonical-package’.
* gnu/packages/gawk.scm (gawk)[native-inputs]: New field.
* gnu/packages/texinfo.scm (texinfo)[native-inputs]: Add
‘libc-utf8-locales-for-target’.
Change-Id: I2283ffc6c6000c98ad2db89c04d581e050667c94
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2f48f65caf..1140aa7491 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1651,9 +1651,14 @@ command.") (define* (libc-utf8-locales-for-target #:optional (target (or (%current-target-system) (%current-system)))) - (if (target-hurd? target) - glibc-utf8-locales/hurd - glibc-utf8-locales)) + "Return the glibc UTF-8 locale package for TARGET." + ;; Note: To avoid circular dependencies (such as: texinfo -> + ;; glibc-utf8-locales -> glibc -> texinfo), refer to + ;; 'glibc-utf8-locales-final' via 'canonical-package'. + (canonical-package + (if (target-hurd? target) + glibc-utf8-locales/hurd + glibc-utf8-locales))) (define-public tzdata (package |