[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/142: gnu: gsettings-desktop-schemas: Add python to native inputs.
From: |
guix-commits |
Subject: |
41/142: gnu: gsettings-desktop-schemas: Add python to native inputs. |
Date: |
Mon, 10 Jan 2022 13:07:19 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 2080f55590f0a3d8f766754e19999a91a9f71f58
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Dec 18 21:14:19 2021 -0500
gnu: gsettings-desktop-schemas: Add python to native inputs.
Since commit 5d20d7e1369fc7d93de19c0bd219937d697ceae6, meson no longer
propagates Python, which is the reason this change is now needed here.
* gnu/packages/gnome.scm (gsettings-desktop-schemas)
[phases]{patch-schemas}: Use 'search-input-directory'.
[native-inputs]: Use new style and add python.
---
gnu/packages/gnome.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1ac80bb98f..2779b65666 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2661,25 +2661,24 @@ on the GNOME Desktop with a single simple application.")
"1v9jagk679m01nji0acirynxinziv036618c7xc49l4nwmr9ja3p"))))
(build-system meson-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
+ `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-schemas
(lambda* (#:key inputs #:allow-other-keys)
- (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"))
- ;; Do not reference fonts, that may not exist.
- (("'Source Code Pro 10'") "'Monospace 11'"))))))))
- (inputs
- (list glib gnome-backgrounds))
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib" ,glib "bin") ; glib-compile-schemas, etc.
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ (substitute* (find-files "schemas"
+ "\\.gschema\\.xml\\.in$")
+ ;; Provide the correct file name of the default
+ ;; GNOME background, 'adwaita-timed.xml'.
+ (("@datadir@/backgrounds/gnome")
+ (search-input-directory inputs
+ "/share/backgrounds/gnome"))
+ ;; Do not reference fonts, that may not exist.
+ (("'Source Code Pro 10'") "'Monospace 11'")))))))
+ (inputs (list glib gnome-backgrounds))
+ (native-inputs (list gettext-minimal
+ `(,glib "bin") ;glib-compile-schemas, etc.
+ gobject-introspection
+ pkg-config
+ python)) ;for build-aux/meson/post-install.py
(home-page "https://launchpad.net/gsettings-desktop-schemas")
(synopsis "GNOME settings for various desktop components")
(description "Gsettings-desktop-schemas contains a collection of GSettings
- 89/142: gnu: igraph: Update to 0.9.5., (continued)
- 89/142: gnu: igraph: Update to 0.9.5., guix-commits, 2022/01/10
- 92/142: build-system/gnu: Make gzip files writable before resetting timestamps., guix-commits, 2022/01/10
- 93/142: gnu: python-biom-format: Remove obsolete phase., guix-commits, 2022/01/10
- 17/142: guix: lint: Fix comment per TODO., guix-commits, 2022/01/10
- 24/142: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 25/142: gnu: libproxy: Remove target condition from check phase., guix-commits, 2022/01/10
- 27/142: gnu: python-nose: Fix build., guix-commits, 2022/01/10
- 30/142: gnu: glibmm: Remove trailing #t., guix-commits, 2022/01/10
- 26/142: gnu: glib: Fix cross-compilation., guix-commits, 2022/01/10
- 34/142: gnu: eudev: Update to 3.2.11., guix-commits, 2022/01/10
- 41/142: gnu: gsettings-desktop-schemas: Add python to native inputs.,
guix-commits <=
- 46/142: gnu: libxkbcommon: Add python to native inputs., guix-commits, 2022/01/10
- 49/142: gnu: pangomm: Add python to native inputs., guix-commits, 2022/01/10
- 58/142: gnu: glade3: Add python to native inputs., guix-commits, 2022/01/10
- 55/142: gnu: python-msgpack: Update to 1.0.3., guix-commits, 2022/01/10
- 59/142: gnu: python-curio: Disable newly failing 'test_timeout' test., guix-commits, 2022/01/10
- 07/142: gnu: python-tomli: Update to 2.0.0., guix-commits, 2022/01/10
- 22/142: gnu: cairo: Use bash-minimal unconditionally., guix-commits, 2022/01/10
- 40/142: gnu: gnome-backgrounds: Update to 41.0., guix-commits, 2022/01/10
- 43/142: gnu: epiphany: Update to 41.2., guix-commits, 2022/01/10
- 45/142: gnu: wayland-protocols: Add python to native inputs., guix-commits, 2022/01/10