[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/145: gnu: gsettings-desktop-schemas: Add python to native inputs.
From: |
guix-commits |
Subject: |
41/145: gnu: gsettings-desktop-schemas: Add python to native inputs. |
Date: |
Mon, 10 Jan 2022 11:44:06 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 9588eb06ba2baf8f812746f2babe80e96a4a9a35
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 1a3dbf6fc9..bac05c6ab8 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
- 03/145: gnu: mesa: Update to 21.3.2., (continued)
- 03/145: gnu: mesa: Update to 21.3.2., guix-commits, 2022/01/10
- 07/145: gnu: python-tomli: Update to 2.0.0., guix-commits, 2022/01/10
- 14/145: gnu: autoconf-2.69: Repatriate unpatch-shebangs phase from 2.71., guix-commits, 2022/01/10
- 11/145: utils: Fix wrap-script argument handling., guix-commits, 2022/01/10
- 12/145: gnu: python-3.9: Update to 3.9.9., guix-commits, 2022/01/10
- 19/145: gnu: gobject-introspection: Unconditionally use flex and bison., guix-commits, 2022/01/10
- 22/145: gnu: cairo: Use bash-minimal unconditionally., guix-commits, 2022/01/10
- 26/145: gnu: glib: Fix cross-compilation., guix-commits, 2022/01/10
- 31/145: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 24/145: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 41/145: gnu: gsettings-desktop-schemas: Add python to native inputs.,
guix-commits <=
- 35/145: gnu: cmake-bootstrap: Update to 3.21.4., guix-commits, 2022/01/10
- 10/145: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 06/145: gnu: python-pyparsing: Update to 3.0.6., guix-commits, 2022/01/10
- 09/145: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 16/145: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/145: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10
- 30/145: gnu: glibmm: Remove trailing #t., guix-commits, 2022/01/10
- 32/145: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10
- 20/145: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10