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/texinfo.scm | |
| parent | 5b3e996d2980cf6549264ae111f36598efc91114 (diff) | |
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/texinfo.scm')
| -rw-r--r-- | gnu/packages/texinfo.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index bfa975acc0..79c21d8b45 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -38,6 +38,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) @@ -79,10 +80,12 @@ #:tests? ,(and (not (target-hurd?)) (not (%current-target-system))))) (inputs (list ncurses perl)) + ;; When cross-compiling, texinfo will build some of its own binaries with ;; the native compiler. This means ncurses is needed both in both inputs - ;; and native-inputs. - (native-inputs (list perl ncurses)) + ;; and native-inputs. Some of its tests require extra locales such as + ;; fr_FR.UTF-8. + (native-inputs (list perl ncurses (libc-utf8-locales-for-target))) (native-search-paths ;; This is the variable used by the standalone Info reader. |