git.iko.soy/typeable/nixpkgs
on master help sign in
pantheon.elementary-settings-daemon: 3.32.0 -> 3.30.2

This downgrade is needed temporarily to alleviate breakages such as [0] to Pantheon on Unstable. [0]: https://github.com/elementary/gala/issues/518

commitf7bbb18f83f46b6e95663469e06ece2d2aba854c authorworldofpeace <worldofpeace@protonmail.ch> dateTue 11 Jun 2019, 02:40 (7 years ago) parentb0bea52
2 files changed+21−18
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+6−3 pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch+15−15
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+6−3
@@ -36,25 +36,26 @@
3636, systemd
3737, tzdata
3838, upower
39+, libXtst
3940, wrapGAppsHook
4041}:
4142
4243stdenv.mkDerivation rec {
4344 pname = "elementary-settings-daemon";
44− version = "3.32.0";
45+ version = "3.30.2";
4546
4647 projectName = "gnome-settings-daemon";
4748
4849 src = fetchurl {
4950 url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
50− sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
51+ sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
5152 };
5253
5354 # Source for ubuntu's patchset
5455 src2 = fetchgit {
5556 url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
5657 rev = "refs/tags/ubuntu/${version}-1ubuntu1";
57− sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn";
58+ sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
5859 };
5960
6061 # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
7172 "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
7273 "${patchPath}/correct_logout_action.patch"
7374 "${patchPath}/ubuntu-lid-close-suspend.patch"
75+ "${patchPath}/revert-wacom-migration.patch"
7476 "${patchPath}/revert-gsettings-removals.patch"
7577 "${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
7678 "${patchPath}/ubuntu_ibus_configs.patch"
@@ -129,6 +131,7 @@ stdenv.mkDerivation rec {
129131 gsettings-desktop-schemas
130132 gtk3
131133 lcms2
134+ libXtst
132135 libcanberra-gtk3
133136 libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
134137 libgudev
pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch+15−15
@@ -1,18 +1,18 @@
1−diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
2−index d7d10fd2..5619d6ad 100644
3−--- a/plugins/power/gsd-backlight.c
4−+++ b/plugins/power/gsd-backlight.c
5−@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
6− proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
7− &error,
8− "pkexec",
9−- LIBEXECDIR "/gsd-backlight-helper",
10−+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper",
11− g_udev_device_get_sysfs_path (backlight->udev_device),
12− data->value_str, NULL);
13− } else {
1+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
2+index e83f1549..15890053 100644
3+--- a/plugins/power/gpm-common.c
4++++ b/plugins/power/gpm-common.c
5+@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command,
6+ gchar *argv[5] = { 0 };
7+
8+ argv[0] = "pkexec";
9+- argv[1] = LIBEXECDIR "/gsd-backlight-helper";
10++ argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper";
11+ argv[2] = helper_args[command];
12+ argv[3] = value;
13+
1414diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
15−index f16300f8..79d6bd17 100644
15+index f16300f8..f19bba3e 100644
1616--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
1717+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
1818@@ -25,7 +25,7 @@
@@ -22,5 +22,5 @@ index f16300f8..79d6bd17 100644
2222- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
2323+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate>
2424 </action>
25−
25+
2626 </policyconfig>