[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)
- branch master updated (6145b16 -> 830dab8), guix-commits, 2020/03/20
- 01/09: gnu: libiberty: Do not inherit properties from GCC., guix-commits, 2020/03/20
- 03/09: gnu: add premake5., guix-commits, 2020/03/20
- 02/09: gnu: gsettings-desktop-schemas: patch monospace font.,
guix-commits <=
- 06/09: gnu: make-libiberty: Use install-file., guix-commits, 2020/03/20
- 08/09: gnu: Add squid., guix-commits, 2020/03/20
- 07/09: gnu: emacs-projectile: Update to 2.1.0., guix-commits, 2020/03/20
- 09/09: gnu: ansible: Update to 2.9.6., guix-commits, 2020/03/20
- 05/09: gnu: Add blktrace., guix-commits, 2020/03/20
- 04/09: gnu: Add wev., guix-commits, 2020/03/20