ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gsettings-desktop-schemas: Add python to native inputs.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2021-12-18 21:14:19 -05:00
parent ee16c5a685
commit 2080f55590
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/gnome.scm
View file

@ -2661,25 +2661,24 @@ (define-public gsettings-desktop-schemas
"1v9jagk679m01nji0acirynxinziv036618c7xc49l4nwmr9ja3p")))) "1v9jagk679m01nji0acirynxinziv036618c7xc49l4nwmr9ja3p"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-schemas (add-after 'unpack 'patch-schemas
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((theme (assoc-ref inputs "gnome-backgrounds"))) (substitute* (find-files "schemas"
(substitute* (find-files "schemas" "\\.gschema\\.xml\\.in$")
"\\.gschema\\.xml\\.in$") ;; Provide the correct file name of the default
;; Provide the correct file name of the default ;; GNOME background, 'adwaita-timed.xml'.
;; GNOME background, 'adwaita-timed.xml'. (("@datadir@/backgrounds/gnome")
(("@datadir@/backgrounds/gnome") (search-input-directory inputs
(string-append theme "/share/backgrounds/gnome")) "/share/backgrounds/gnome"))
;; Do not reference fonts, that may not exist. ;; Do not reference fonts, that may not exist.
(("'Source Code Pro 10'") "'Monospace 11'")))))))) (("'Source Code Pro 10'") "'Monospace 11'")))))))
(inputs (inputs (list glib gnome-backgrounds))
(list glib gnome-backgrounds)) (native-inputs (list gettext-minimal
(native-inputs `(,glib "bin") ;glib-compile-schemas, etc.
`(("gettext" ,gettext-minimal) gobject-introspection
("glib" ,glib "bin") ; glib-compile-schemas, etc. pkg-config
("gobject-introspection" ,gobject-introspection) python)) ;for build-aux/meson/post-install.py
("pkg-config" ,pkg-config)))
(home-page "https://launchpad.net/gsettings-desktop-schemas") (home-page "https://launchpad.net/gsettings-desktop-schemas")
(synopsis "GNOME settings for various desktop components") (synopsis "GNOME settings for various desktop components")
(description "Gsettings-desktop-schemas contains a collection of GSettings (description "Gsettings-desktop-schemas contains a collection of GSettings