gnu: gnome-settings-daemon: Update to 42.2.
* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 42.2.
[arguments]: Use gexps.
[phases]{set-baobab-file-name}: Use search-input-file.
[native-inputs]: Delete labels. Replace intltool with gettext-minimal. Add
perl.
[inputs]: Sort lexicographically. Replace gsettings-desktop-schemas with
gsettings-desktop-schemas-next, libgweather with libgweather4-with-libsoup2.
This commit is contained in:
Maxim Cournoyer
parent
667f09218b
commit
587829ae26
1 changed files with 50 additions and 53 deletions
|
|
@ -5664,7 +5664,7 @@ services for numerous locations.")
|
||||||
(define-public gnome-settings-daemon
|
(define-public gnome-settings-daemon
|
||||||
(package
|
(package
|
||||||
(name "gnome-settings-daemon")
|
(name "gnome-settings-daemon")
|
||||||
(version "41.0")
|
(version "42.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -5673,71 +5673,68 @@ services for numerous locations.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"111qcvlqjpasnswdniy5n53wyrs1y7a91qx1w4nsppnizdhn7jp6"))
|
"005b1dvrfcyr6n4srl6c0lzr95c18prps4xm1lf2ghcfm8a9fi4w"))
|
||||||
(patches (search-patches "gnome-settings-daemon-gc.patch"))))
|
(patches (search-patches "gnome-settings-daemon-gc.patch"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:glib-or-gtk? #t
|
(list
|
||||||
#:meson ,meson-0.60
|
#:glib-or-gtk? #t
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list (string-append "-Dudev_dir="
|
#~(list (string-append "-Dudev_dir=" #$output "/lib/udev")
|
||||||
(assoc-ref %outputs "out") "/lib/udev")
|
"-Dsystemd=false"
|
||||||
"-Dsystemd=false"
|
;; Otherwise, the RUNPATH will lack the final path component.
|
||||||
;; Otherwise, the RUNPATH will lack the final path component.
|
(string-append "-Dc_link_args=-Wl,-rpath=" #$output
|
||||||
(string-append "-Dc_link_args=-Wl,-rpath="
|
"/lib/gnome-settings-daemon-3.0"))
|
||||||
(assoc-ref %outputs "out")
|
#:phases
|
||||||
"/lib/gnome-settings-daemon-3.0"))
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'configure 'set-baobab-file-name
|
||||||
#:phases (modify-phases %standard-phases
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(add-before 'configure 'set-baobab-file-name
|
;; Hard-code the file name of Baobab instead of looking
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
;; it up in $PATH. This ensures users get the "Examine"
|
||||||
;; Hard-code the file name of Baobab instead of looking
|
;; button in the low disk space notification of GDM even
|
||||||
;; it up in $PATH. This ensures users get the "Examine"
|
;; if they don't have GNOME in their main profile.
|
||||||
;; button in the low disk space notification of GDM even
|
(substitute* "plugins/housekeeping/gsd-disk-space.c"
|
||||||
;; if they don't have GNOME in their main profile.
|
(("g_find_program_in_path \\(DISK_SPACE_ANALYZER\\)")
|
||||||
(let ((baobab (assoc-ref inputs "baobab")))
|
(format #f "g_strdup (~s)"
|
||||||
(substitute* "plugins/housekeeping/gsd-disk-space.c"
|
(search-input-file inputs "bin/baobab")))))))
|
||||||
(("g_find_program_in_path \\(DISK_SPACE_ANALYZER\\)")
|
;; Color management test can't reach the colord system service.
|
||||||
(string-append "g_strdup (\"" baobab
|
#:tests? #f))
|
||||||
"/bin/baobab\")")))))))
|
|
||||||
|
|
||||||
;; Color management test can't reach the colord system service.
|
|
||||||
#:tests? #f))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("glib:bin" ,glib "bin") ; for glib-mkenums
|
(list docbook-xml-4.2
|
||||||
("pkg-config" ,pkg-config)
|
docbook-xsl
|
||||||
("intltool" ,intltool)
|
gettext-minimal
|
||||||
("xsltproc" ,libxslt)
|
`(,glib "bin") ;for glib-mkenums
|
||||||
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
|
libxml2 ;for XML_CATALOG_FILES
|
||||||
("docbook-xml" ,docbook-xml-4.2)
|
libxslt
|
||||||
("docbook-xsl" ,docbook-xsl)))
|
perl
|
||||||
|
pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
(list alsa-lib
|
(list alsa-lib
|
||||||
baobab
|
baobab
|
||||||
colord
|
colord
|
||||||
libgudev
|
cups
|
||||||
upower
|
gcr
|
||||||
polkit
|
|
||||||
pulseaudio
|
|
||||||
libcanberra
|
|
||||||
libx11
|
|
||||||
libxtst
|
|
||||||
lcms
|
|
||||||
libnotify
|
|
||||||
geoclue
|
geoclue
|
||||||
geocode-glib-with-libsoup2
|
geocode-glib-with-libsoup2
|
||||||
libgweather
|
|
||||||
gnome-desktop
|
gnome-desktop
|
||||||
nss
|
gsettings-desktop-schemas-next
|
||||||
cups
|
lcms
|
||||||
gsettings-desktop-schemas
|
libcanberra
|
||||||
libwacom
|
libgudev
|
||||||
|
libgweather4-with-libsoup2
|
||||||
|
libnotify
|
||||||
(librsvg-for-system)
|
(librsvg-for-system)
|
||||||
xf86-input-wacom
|
libwacom
|
||||||
wayland
|
libx11
|
||||||
|
libxtst
|
||||||
|
modem-manager
|
||||||
network-manager
|
network-manager
|
||||||
gcr
|
nss
|
||||||
modem-manager))
|
polkit
|
||||||
|
pulseaudio
|
||||||
|
upower
|
||||||
|
wayland
|
||||||
|
xf86-input-wacom))
|
||||||
(home-page "https://www.gnome.org")
|
(home-page "https://www.gnome.org")
|
||||||
(synopsis "GNOME settings daemon")
|
(synopsis "GNOME settings daemon")
|
||||||
(description
|
(description
|
||||||
|
|
|
||||||
Reference in a new issue