diff options
| -rw-r--r-- | gnu/packages/fonts.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/mate.scm | 2 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5cf2393177e..de1acc5a75f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm | |||
| @@ -197,10 +197,10 @@ includes lining and old-style numerals, tabular and proportional. Greek, | |||
| 197 | Cyrillic, Canadian Syllabics and most Latin based languages are supported.") | 197 | Cyrillic, Canadian Syllabics and most Latin based languages are supported.") |
| 198 | (license license:cc0))) | 198 | (license license:cc0))) |
| 199 | 199 | ||
| 200 | (define-public font-cantarell | 200 | (define-public font-abattis-cantarell |
| 201 | (package | 201 | (package |
| 202 | (name "font-abattis-cantarell") | 202 | (name "font-abattis-cantarell") |
| 203 | (version "0.301") | 203 | (version "0.303") |
| 204 | (source (origin | 204 | (source (origin |
| 205 | (method url-fetch) | 205 | (method url-fetch) |
| 206 | (uri (string-append "mirror://gnome/sources/cantarell-fonts/" | 206 | (uri (string-append "mirror://gnome/sources/cantarell-fonts/" |
| @@ -208,7 +208,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") | |||
| 208 | "/cantarell-fonts-" version ".tar.xz")) | 208 | "/cantarell-fonts-" version ".tar.xz")) |
| 209 | (sha256 | 209 | (sha256 |
| 210 | (base32 | 210 | (base32 |
| 211 | "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) | 211 | "11sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) |
| 212 | (build-system meson-build-system) | 212 | (build-system meson-build-system) |
| 213 | (native-inputs | 213 | (native-inputs |
| 214 | `(("gettext" ,gettext-minimal))) ; for msgfmt | 214 | `(("gettext" ,gettext-minimal))) ; for msgfmt |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 17fb2e01461..20c0be8d9de 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -9242,7 +9242,7 @@ world.") | |||
| 9242 | ;; Packages not part of GNOME proper but that are needed for a good | 9242 | ;; Packages not part of GNOME proper but that are needed for a good |
| 9243 | ;; experience. See <https://bugs.gnu.org/39646>. | 9243 | ;; experience. See <https://bugs.gnu.org/39646>. |
| 9244 | ;; XXX: Find out exactly which ones are needed and why. | 9244 | ;; XXX: Find out exactly which ones are needed and why. |
| 9245 | ("font-cantarell" ,font-cantarell) | 9245 | ("font-abattis-cantarell" ,font-abattis-cantarell) |
| 9246 | ("font-dejavu" ,font-dejavu) | 9246 | ("font-dejavu" ,font-dejavu) |
| 9247 | ("at-spi2-core" ,at-spi2-core) | 9247 | ("at-spi2-core" ,at-spi2-core) |
| 9248 | ("dbus" ,dbus) | 9248 | ("dbus" ,dbus) |
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2a587d9e32e..243a7de08c5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm | |||
| @@ -331,7 +331,7 @@ applications.") | |||
| 331 | (add-after 'unpack 'disable-cantarell-tests | 331 | (add-after 'unpack 'disable-cantarell-tests |
| 332 | (lambda _ | 332 | (lambda _ |
| 333 | (substitute* "tests/meson.build" | 333 | (substitute* "tests/meson.build" |
| 334 | ;; XXX FIXME: These tests require "font-cantarell", but | 334 | ;; XXX FIXME: These tests require "font-abattis-cantarell", but |
| 335 | ;; adding it here would introduce a circular dependency. | 335 | ;; adding it here would introduce a circular dependency. |
| 336 | (("\\[ 'test-harfbuzz'.*") "") | 336 | (("\\[ 'test-harfbuzz'.*") "") |
| 337 | (("\\[ 'test-itemize'.*") "") | 337 | (("\\[ 'test-itemize'.*") "") |
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 82b2d6e0fdd..ede37fe5d9e 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm | |||
| @@ -1545,7 +1545,7 @@ used to bring up authentication dialogs.") | |||
| 1545 | ("dconf" ,dconf) | 1545 | ("dconf" ,dconf) |
| 1546 | ("engrampa" ,engrampa) | 1546 | ("engrampa" ,engrampa) |
| 1547 | ("eom" ,eom) | 1547 | ("eom" ,eom) |
| 1548 | ("font-cantarell" ,font-cantarell) | 1548 | ("font-abattis-cantarell" ,font-abattis-cantarell) |
| 1549 | ("glib-networking" ,glib-networking) | 1549 | ("glib-networking" ,glib-networking) |
| 1550 | ("gnome-keyring" ,gnome-keyring) | 1550 | ("gnome-keyring" ,gnome-keyring) |
| 1551 | ("gvfs" ,gvfs) | 1551 | ("gvfs" ,gvfs) |
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index d5c5316d3fe..930927e28c4 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm | |||
| @@ -879,7 +879,7 @@ the GNOME desktop environment.") | |||
| 879 | (debug? gdm-configuration-debug? (default #f)) | 879 | (debug? gdm-configuration-debug? (default #f)) |
| 880 | (default-user gdm-configuration-default-user (default #f)) | 880 | (default-user gdm-configuration-default-user (default #f)) |
| 881 | (gnome-shell-assets gdm-configuration-gnome-shell-assets | 881 | (gnome-shell-assets gdm-configuration-gnome-shell-assets |
| 882 | (default (list adwaita-icon-theme font-cantarell))) | 882 | (default (list adwaita-icon-theme font-abattis-cantarell))) |
| 883 | (xorg-configuration gdm-configuration-xorg | 883 | (xorg-configuration gdm-configuration-xorg |
| 884 | (default (xorg-configuration))) | 884 | (default (xorg-configuration))) |
| 885 | (x-session gdm-configuration-x-session | 885 | (x-session gdm-configuration-x-session |
