diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-15 16:30:00 -0400 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 12:14:14 +0200 |
commit | a2c1f97a11b6df799dbe99be0acbd4a794d1ff58 (patch) | |
tree | e5b7189fb000969177d58a3203a8b628cbec7252 /pkgs/desktops/pantheon/services | |
parent | 87d1ff41fdc5c8b2b887ac51d77fa5e8b9125446 (diff) | |
download | nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar.gz nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar.bz2 nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar.lz nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar.xz nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.tar.zst nixpkgs-a2c1f97a11b6df799dbe99be0acbd4a794d1ff58.zip |
pantheon.elementary-settings-daemon: 3.30.2 -> 3.32.0
- sync patches [0] - clean up deps - use gnome3.updateScript [0]: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon/commit/?id=bab64774ef3a8f17b6fa29bb1d7aa1cb7c964341
Diffstat (limited to 'pkgs/desktops/pantheon/services')
-rw-r--r-- | pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix | 76 |
1 files changed, 57 insertions, 19 deletions
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 3829cf551f7..1dfa64ae373 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,23 +1,59 @@ -{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit -, geocode-glib, gtk3 -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: +{ accountsservice +, alsaLib +, colord +, docbook_xsl +, fetchgit +, fetchurl +, geoclue2 +, geocode-glib +, gettext +, glib +, gnome3 +, gsettings-desktop-schemas +, gtk3 +, lcms2 +, libcanberra-gtk3 +, libgnomekbd +, libgudev +, libgweather +, libnotify +, libpulseaudio +, libwacom +, libxml2 +, libxslt +, meson +, networkmanager +, ninja +, nss +, pantheon +, perl +, pkgconfig +, polkit +, python3 +, substituteAll +, systemd +, tzdata +, upower +, wrapGAppsHook +, stdenv +}: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.30.2"; + version = "3.32.0"; + + projectName = "gnome-settings-daemon"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; + sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; }; # Source for ubuntu's patchset src2 = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon"; + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. @@ -33,7 +69,6 @@ stdenv.mkDerivation rec { "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" "${patchPath}/ubuntu_ibus_configs.patch" @@ -60,6 +95,7 @@ stdenv.mkDerivation rec { done # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 + # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop ''; @@ -84,32 +120,34 @@ stdenv.mkDerivation rec { geocode-glib glib gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gtk3 - ibus lcms2 - libXtst libcanberra-gtk3 + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgudev libgweather libnotify libpulseaudio - librsvg libwacom - libxkbfile networkmanager nss polkit - udev + systemd upower - xf86_input_wacom - xkeyboard_config ]; mesonFlags = [ "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = projectName; + attrPath = "pantheon.${pname}"; + }; + }; + meta = with stdenv.lib; { license = licenses.gpl2Plus; maintainers = pantheon.maintainers; |