guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/09: gnu: gsettings-desktop-schemas: patch monospace font.


From: guix-commits
Subject: 02/09: gnu: gsettings-desktop-schemas: patch monospace font.
Date: Fri, 20 Mar 2020 14:18:16 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 3861fb1c1f0e33ea714093e98da828d03acf21e5
Author: Leo Prikler <address@hidden>
AuthorDate: Tue Feb 25 15:59:10 2020 +0100

    gnu: gsettings-desktop-schemas: patch monospace font.
    
    * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]<phases>:
    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 <address@hidden>
---
 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 c39b446..bc78910 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -44,7 +44,7 @@
 ;;; Copyright © 2019 David Wilson <address@hidden>
 ;;; Copyright © 2019, 2020 Raghav Gururajan <address@hidden>
 ;;; Copyright © 2019 Jonathan Brielmaier <address@hidden>
-;;; Copyright © 2019 Leo Prikler <address@hidden>
+;;; Copyright © 2019, 2020 Leo Prikler <address@hidden>
 ;;; Copyright © 2020 Oleg Pykhalov <address@hidden>
 ;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
 ;;; Copyright © 2020 raingloom <address@hidden>
@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]