ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: font-abattis-cantarell: Update variable name.

Browse source 
* gnu/packages/fonts.scm (font-cantarell): Rename to…
(font-abattis-cantarell): …this.
* gnu/packages/gnome.scm (gnome)[propagated-inputs]: Adjust accordingly.
* gnu/packages/mate.scm (mate)[inputs]: Likewise.
* gnu/services/xorg.scm (<gdm-configuration>): Likewise.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-15 18:10:33 +02:00
parent 3f396ec339
commit 44469ffd83
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/fonts.scm
View file

@ -197,10 +197,10 @@ (define-public font-canada1500
Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(license license:cc0)))
(define-public font-cantarell
(define-public font-abattis-cantarell
(package
(name "font-abattis-cantarell")
(version "0.301")
(version "0.303")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/cantarell-fonts/"
@ -208,7 +208,7 @@ (define-public font-cantarell
"/cantarell-fonts-" version ".tar.xz"))
(sha256
(base32
"10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x"))))
"11sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x"))))
(build-system meson-build-system)
(native-inputs
`(("gettext" ,gettext-minimal))) ; for msgfmt

2
gnu/packages/gnome.scm
View file

@ -9242,7 +9242,7 @@ (define-public gnome
;; Packages not part of GNOME proper but that are needed for a good
;; experience. See <https://bugs.gnu.org/39646>.
;; XXX: Find out exactly which ones are needed and why.
("font-cantarell" ,font-cantarell)
("font-abattis-cantarell" ,font-abattis-cantarell)
("font-dejavu" ,font-dejavu)
("at-spi2-core" ,at-spi2-core)
("dbus" ,dbus)

2
gnu/packages/gtk.scm
View file

@ -331,7 +331,7 @@ (define-public pango
(add-after 'unpack 'disable-cantarell-tests
(lambda _
(substitute* "tests/meson.build"
;; XXX FIXME: These tests require "font-cantarell", but
;; XXX FIXME: These tests require "font-abattis-cantarell", but
;; adding it here would introduce a circular dependency.
(("\\[ 'test-harfbuzz'.*") "")
(("\\[ 'test-itemize'.*") "")

2
gnu/packages/mate.scm
View file

@ -1545,7 +1545,7 @@ (define-public mate
("dconf" ,dconf)
("engrampa" ,engrampa)
("eom" ,eom)
("font-cantarell" ,font-cantarell)
("font-abattis-cantarell" ,font-abattis-cantarell)
("glib-networking" ,glib-networking)
("gnome-keyring" ,gnome-keyring)
("gvfs" ,gvfs)

2
gnu/services/xorg.scm
View file

@ -879,7 +879,7 @@ (define-record-type* <gdm-configuration>
(debug? gdm-configuration-debug? (default #f))
(default-user gdm-configuration-default-user (default #f))
(gnome-shell-assets gdm-configuration-gnome-shell-assets
(default (list adwaita-icon-theme font-cantarell)))
(default (list adwaita-icon-theme font-abattis-cantarell)))
(xorg-configuration gdm-configuration-xorg
(default (xorg-configuration)))
(x-session gdm-configuration-x-session