summary refs log tree commit diff
path: root/pkgs/desktops/pantheon/services
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-25 08:16:20 -0400
committerJan Tojnar <jtojnar@gmail.com>2019-10-03 00:09:17 +0200
commit513e8de83bcfd690db57e737b80816324913fe5c (patch)
tree473e8cc06f37b9959c609f4b75e3bad1d948c776 /pkgs/desktops/pantheon/services
parentda8226b3342bbd38bd7083282f8c17dd7f561b2f (diff)
downloadnixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar.gz
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar.bz2
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar.lz
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar.xz
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.tar.zst
nixpkgs-513e8de83bcfd690db57e737b80816324913fe5c.zip
pantheon.elementary-settings-daemon: fix gnome-session detecting autostarts
For some reason GNOME 3.34 gnome-session fails to recognize
these autostarts suffixed with `-pantheon`, whereas they worked before.
It seems to work fine without the suffix, and it's verified elementary-settings-daemon
proccess are running in the session.
Diffstat (limited to 'pkgs/desktops/pantheon/services')
-rw-r--r--pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 67a67dd4b3d..d29178b220d 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -90,8 +90,6 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done
-
     for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart)
     do
       echo "Patching OnlyShowIn to Pantheon in: $autostart"
@@ -100,7 +98,7 @@ 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
+    rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.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