diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-10-22 10:23:19 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-02 12:25:45 +0100 |
| commit | b0715d7cd2a74bc231751f8afc9dffb2047501ac (patch) | |
| tree | c181bd85350c7f87130ba517f9ed95574c74f4ee /gnu/packages | |
| parent | 9442b53c6b4dbf078f37a52687a32ecbd2ca430d (diff) | |
gnu: Use ‘libc-utf8-locales-for-target’.
* guix/packages.scm (%standard-patch-inputs): Use
‘libc-utf8-locales-for-target’ instead of ‘glibc-utf8-locales’.
* guix/self.scm (%packages): Likewise.
* gnu/home/services/ssh.scm (file-join): Likewise
* gnu/installer.scm (build-compiled-file): Likewise.
* gnu/packages/chromium.scm (ungoogled-chromium/wayland): Likewise.
* gnu/packages/gnome.scm (libgweather4, tracker): Likewise.
* gnu/packages/javascript.scm (js-mathjax): Likewise.
* gnu/packages/package-management.scm (guix, flatpak): Likewise.
* gnu/packages/raspberry-pi.scm (raspi-arm64-chainloader): Likewise.
* gnu/packages/suckless.scm (svkbd): Likewise.
* gnu/services.scm (cleanup-gexp): Likewise.
* gnu/services/base.scm (guix-publish-shepherd-service): Likewise.
* gnu/services/guix.scm (guix-build-coordinator-shepherd-services)
(guix-build-coordinator-agent-shepherd-services): Likewise.
* gnu/services/guix.scm (guix-build-coordinator-queue-builds-shepherd-services):
(guix-data-service-shepherd-services)
(nar-herder-shepherd-services)
(bffe-shepherd-services): Likewise.
* gnu/services/web.scm (anonip-shepherd-service)
(mumi-shepherd-services): Likewise.
* gnu/system/image.scm (system-disk-image, system-iso9660-image)
(system-docker-image, system-tarball-image): Likewise.
* gnu/system/install.scm (%installation-services): Likewise.
* guix/profiles.scm (info-dir-file): Likewise.
(ca-certificate-bundle, profile-derivation): Likewise.
* guix/scripts/pack.scm (store-database, set-utf8-locale): Likewise.
* tests/pack.scm: Likewise.
* tests/profiles.scm ("profile-derivation, cross-compilation"):
Likewise.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Co-authored-by: Christopher Baines <mail@cbaines.net>
Change-Id: I24239f427bcc930c29d2ba5d00dc615960a6c374
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/chromium.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/javascript.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/raspberry-pi.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/suckless.scm | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 513e5459381..bc49e24f0e4 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm | |||
| @@ -967,7 +967,7 @@ testing.") | |||
| 967 | (name "ungoogled-chromium-wayland") | 967 | (name "ungoogled-chromium-wayland") |
| 968 | (native-inputs '()) | 968 | (native-inputs '()) |
| 969 | (inputs | 969 | (inputs |
| 970 | (list bash-minimal glibc-utf8-locales ungoogled-chromium)) | 970 | (list bash-minimal (libc-utf8-locales-for-target) ungoogled-chromium)) |
| 971 | (build-system trivial-build-system) | 971 | (build-system trivial-build-system) |
| 972 | (arguments | 972 | (arguments |
| 973 | (list | 973 | (list |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0be935585d1..7364655d255 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -5917,7 +5917,7 @@ services for numerous locations.") | |||
| 5917 | gi-docgen | 5917 | gi-docgen |
| 5918 | `(,glib "bin") ;for glib-mkenums | 5918 | `(,glib "bin") ;for glib-mkenums |
| 5919 | gobject-introspection | 5919 | gobject-introspection |
| 5920 | glibc-utf8-locales | 5920 | (libc-utf8-locales-for-target) |
| 5921 | gsettings-desktop-schemas | 5921 | gsettings-desktop-schemas |
| 5922 | pkg-config | 5922 | pkg-config |
| 5923 | python | 5923 | python |
| @@ -9471,7 +9471,7 @@ easy, safe, and automatic.") | |||
| 9471 | (native-inputs | 9471 | (native-inputs |
| 9472 | (list gettext-minimal | 9472 | (list gettext-minimal |
| 9473 | `(,glib "bin") | 9473 | `(,glib "bin") |
| 9474 | glibc-utf8-locales | 9474 | (libc-utf8-locales-for-target) |
| 9475 | gobject-introspection | 9475 | gobject-introspection |
| 9476 | docbook-xsl | 9476 | docbook-xsl |
| 9477 | docbook-xml | 9477 | docbook-xml |
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index e70aa7d7e1e..2c7ff744ead 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm | |||
| @@ -184,7 +184,7 @@ context menu in TypeScript.") | |||
| 184 | #t)))) | 184 | #t)))) |
| 185 | (native-inputs | 185 | (native-inputs |
| 186 | `(("font-mathjax" ,font-mathjax) | 186 | `(("font-mathjax" ,font-mathjax) |
| 187 | ("glibc-utf8-locales" ,glibc-utf8-locales) | 187 | ("glibc-utf8-locales" ,(libc-utf8-locales-for-target)) |
| 188 | ("uglifyjs" ,node-uglify-js) | 188 | ("uglifyjs" ,node-uglify-js) |
| 189 | ,@(package-native-inputs font-mathjax))) | 189 | ,@(package-native-inputs font-mathjax))) |
| 190 | (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath") | 190 | (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath") |
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index fb9e57b2e7f..25818944d8e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm | |||
| @@ -524,7 +524,7 @@ $(prefix)/etc/openrc\n"))) | |||
| 524 | 524 | ||
| 525 | ("git-minimal" ,git-minimal) ;for 'guix perform-download' | 525 | ("git-minimal" ,git-minimal) ;for 'guix perform-download' |
| 526 | 526 | ||
| 527 | ("glibc-utf8-locales" ,glibc-utf8-locales))) | 527 | ("glibc-utf8-locales" ,(libc-utf8-locales-for-target)))) |
| 528 | (propagated-inputs | 528 | (propagated-inputs |
| 529 | `(("guile-gnutls" ,guile-gnutls) | 529 | `(("guile-gnutls" ,guile-gnutls) |
| 530 | ;; Avahi requires "glib" which doesn't cross-compile yet. | 530 | ;; Avahi requires "glib" which doesn't cross-compile yet. |
| @@ -2052,7 +2052,7 @@ cp -r /tmp/locale/*/en_US.*"))) | |||
| 2052 | dbus ; for dbus-daemon | 2052 | dbus ; for dbus-daemon |
| 2053 | gettext-minimal | 2053 | gettext-minimal |
| 2054 | `(,glib "bin") ; for glib-mkenums + gdbus-codegen | 2054 | `(,glib "bin") ; for glib-mkenums + gdbus-codegen |
| 2055 | glibc-utf8-locales | 2055 | (libc-utf8-locales-for-target) |
| 2056 | gobject-introspection | 2056 | gobject-introspection |
| 2057 | libcap | 2057 | libcap |
| 2058 | pkg-config | 2058 | pkg-config |
diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index 80bfaf0896c..5c25ed96da5 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm | |||
| @@ -199,7 +199,7 @@ Raspberry Pi. Note: It does not work on Raspberry Pi 1.") | |||
| 199 | ("ld-wrapper" ,ld-wrapper) | 199 | ("ld-wrapper" ,ld-wrapper) |
| 200 | ("make" ,gnu-make) | 200 | ("make" ,gnu-make) |
| 201 | ("gcc" ,gcc-6) | 201 | ("gcc" ,gcc-6) |
| 202 | ("locales" ,glibc-utf8-locales))) | 202 | ("locales" ,(libc-utf8-locales-for-target)))) |
| 203 | (inputs | 203 | (inputs |
| 204 | `()) | 204 | `()) |
| 205 | (arguments | 205 | (arguments |
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 400832045ff..714225c654b 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm | |||
| @@ -1247,7 +1247,7 @@ a nice format.") | |||
| 1247 | (delete 'configure)))) ;no configure script | 1247 | (delete 'configure)))) ;no configure script |
| 1248 | (native-inputs (list pkg-config)) | 1248 | (native-inputs (list pkg-config)) |
| 1249 | (inputs (list freetype libx11 libxft libxtst libxinerama)) | 1249 | (inputs (list freetype libx11 libxft libxtst libxinerama)) |
| 1250 | (propagated-inputs (list glibc-utf8-locales)) | 1250 | (propagated-inputs (list (libc-utf8-locales-for-target))) |
| 1251 | (home-page "https://tools.suckless.org/x/svkbd/") | 1251 | (home-page "https://tools.suckless.org/x/svkbd/") |
| 1252 | (synopsis "Virtual on-screen keyboard") | 1252 | (synopsis "Virtual on-screen keyboard") |
| 1253 | (description "svkbd is a simple virtual keyboard, intended to be used in | 1253 | (description "svkbd is a simple virtual keyboard, intended to be used in |
