public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pantheon.elementary-settings-daemon: 3.32.0 -> 3.30.2

Browse Source 
This downgrade is needed temporarily to alleviate breakages
such as [0] to Pantheon on Unstable.

[0]: https://github.com/elementary/gala/issues/518
This commit is contained in:
worldofpeace 2019-06-11 02:40:21 -04:00
parent b0bea52821
commit f7bbb18f83
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
View File

@ -36,25 +36,26 @@
, systemd , systemd
, tzdata , tzdata
, upower , upower
, libXtst
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-settings-daemon"; pname = "elementary-settings-daemon";
version = "3.32.0"; version = "3.30.2";
projectName = "gnome-settings-daemon"; projectName = "gnome-settings-daemon";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
}; };
# Source for ubuntu's patchset # Source for ubuntu's patchset
src2 = fetchgit { src2 = fetchgit {
url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
rev = "refs/tags/ubuntu/${version}-1ubuntu1"; rev = "refs/tags/ubuntu/${version}-1ubuntu1";
sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn"; sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
}; };
# We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
"${patchPath}/correct_logout_action.patch" "${patchPath}/correct_logout_action.patch"
"${patchPath}/ubuntu-lid-close-suspend.patch" "${patchPath}/ubuntu-lid-close-suspend.patch"
"${patchPath}/revert-wacom-migration.patch"
"${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-gsettings-removals.patch"
"${patchPath}/revert-mediakeys-dbus-interface-drop.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
"${patchPath}/ubuntu_ibus_configs.patch" "${patchPath}/ubuntu_ibus_configs.patch"
@ -129,6 +131,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
lcms2 lcms2
libXtst
libcanberra-gtk3 libcanberra-gtk3
libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
libgudev libgudev

30
pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch
View File

@ -1,18 +1,18 @@
diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
index d7d10fd2..5619d6ad 100644 index e83f1549..15890053 100644
--- a/plugins/power/gsd-backlight.c --- a/plugins/power/gpm-common.c
+++ b/plugins/power/gsd-backlight.c +++ b/plugins/power/gpm-common.c
@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) @@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command,
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, gchar *argv[5] = { 0 };
&error,
"pkexec", argv[0] = "pkexec";
- LIBEXECDIR "/gsd-backlight-helper", - argv[1] = LIBEXECDIR "/gsd-backlight-helper";
+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper";
g_udev_device_get_sysfs_path (backlight->udev_device), argv[2] = helper_args[command];
data->value_str, NULL); argv[3] = value;
} else {
diff --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 diff --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
index f16300f8..79d6bd17 100644 index f16300f8..f19bba3e 100644
--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
@ -22,5 +22,5 @@ index f16300f8..79d6bd17 100644
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate> - <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate>
</action> </action>
</policyconfig> </policyconfig>