dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pantheon.elementary-settings-daemon: fix #14168

Browse Source 
Is the same fix as in #57620 just for Pantheon's settings daemon.
This commit is contained in:
worldofpeace 2019-05-01 12:34:56 -04:00
parent 109399ff31
commit bb4f35b9cc
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit tzdata mousetweaks;
})
./global-backlight-helper.patch
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
"${patchPath}/correct_logout_action.patch"
@ -98,6 +99,10 @@ stdenv.mkDerivation rec {
# 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
# So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper
mkdir -p $out/bin/elementary-settings-daemon
ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper
'';
nativeBuildInputs = [

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

@ -0,0 +1,26 @@
diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
index d7d10fd2..5619d6ad 100644
--- a/plugins/power/gsd-backlight.c
+++ b/plugins/power/gsd-backlight.c
@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
&error,
"pkexec",
- LIBEXECDIR "/gsd-backlight-helper",
+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper",
g_udev_device_get_sysfs_path (backlight->udev_device),
data->value_str, NULL);
} 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
index f16300f8..79d6bd17 100644
--- a/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 @@
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
- <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>
</action>
</policyconfig>