From 3861fb1c1f0e33ea714093e98da828d03acf21e5 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 25 Feb 2020 15:59:10 +0100 Subject: gnu: gsettings-desktop-schemas: patch monospace font. * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]: Rename `set-adwaita-theme-file-name' to the more generic `patch-schemas'. Add patch for the monospace font (Source Code Pro 10 -> Monospace 11). Adjust comments. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c39b4467b9..bc78910c64 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom @@ -1607,15 +1607,17 @@ on the GNOME Desktop with a single simple application.") (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-adwaita-theme-file-name + (add-after 'unpack 'patch-schemas (lambda* (#:key inputs #:allow-other-keys) - ;; Provide the correct file name of the default GNOME - ;; background, 'adwaita-timed.xml'. (let ((theme (assoc-ref inputs "gnome-backgrounds"))) (substitute* (find-files "schemas" "\\.gschema\\.xml\\.in$") + ;; Provide the correct file name of the default GNOME + ;; background, 'adwaita-timed.xml'. (("@datadir@/backgrounds/gnome") - (string-append theme "/share/backgrounds/gnome"))) + (string-append theme "/share/backgrounds/gnome")) + ;; Do not reference fonts, that may not exist. + (("'Source Code Pro 10'") "'Monospace 11'")) #t)))))) (inputs `(("glib" ,glib) -- cgit v1.2.3