gnome3.gnome-settings-daemon: 3.30.2 -> 3.32.0

clean up dependencies
This commit is contained in:
Tor Hedin Brønner 2019-03-03 19:26:35 +01:00 committed by Jan Tojnar
parent fba45f7599
commit 64c5b66290
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -1,15 +1,48 @@
{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst { stdenv
, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas , substituteAll
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager , fetchurl
, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: , meson
, ninja
, pkgconfig
, gnome3
, perl
, gettext
, gtk3
, glib
, libnotify
, libgnomekbd
, lcms2
, libpulseaudio
, alsaLib
, libcanberra-gtk3
, upower
, colord
, libgweather
, polkit
, gsettings-desktop-schemas
, geoclue2
, systemd
, libgudev
, libwacom
, libxslt
, libxml2
, networkmanager
, gnome-desktop
, geocode-glib
, docbook_xsl
, wrapGAppsHook
, python3
, tzdata
, nss
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-settings-daemon-${version}"; pname = "gnome-settings-daemon";
version = "3.30.2"; version = "3.32.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
}; };
patches = [ patches = [
@ -19,13 +52,41 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; nativeBuildInputs = [
meson
ninja
pkgconfig
perl
gettext
libxml2
libxslt
docbook_xsl
wrapGAppsHook
python3
];
buildInputs = [ buildInputs = [
ibus gtk3 glib gsettings-desktop-schemas networkmanager gtk3
libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib glib
libcanberra-gtk3 upower colord libgweather xkeyboard_config nss gsettings-desktop-schemas
polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom networkmanager
libnotify
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
gnome-desktop
lcms2
libpulseaudio
alsaLib
libcanberra-gtk3
upower
colord
libgweather
nss
polkit
geocode-glib
geoclue2
systemd
libgudev
libwacom
]; ];
mesonFlags = [ mesonFlags = [
@ -41,8 +102,8 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "gnome-settings-daemon"; packageName = pname;
attrPath = "gnome3.gnome-settings-daemon"; attrPath = "gnome3.${pname}";
}; };
}; };