summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-04-14 16:34:45 -0500
committerThomas Tuegel <ttuegel@gmail.com>2016-04-20 10:01:06 -0500
commit2780894b1bf8d9541ad024fdbb8694e887ddd649 (patch)
treeaca09e38d0356f74e1bc7ddfeaf66929bcff87de /nixos
parent468d0bc56a8510f84969c0306d927ae0d7813782 (diff)
downloadnixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.gz
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.bz2
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.lz
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.xz
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.tar.zst
nixpkgs-2780894b1bf8d9541ad024fdbb8694e887ddd649.zip
kde5.startkde: init at 5.5.5
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix24
1 files changed, 16 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 4f74d5732af..70dc1ac2a26 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -62,17 +62,25 @@ in
           ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
         ''}
 
-        exec startkde
+        exec "${kde5.startkde}"
+
       '';
     };
 
-    security.setuidOwners = singleton {
-      program = "kcheckpass";
-      source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
-      owner = "root";
-      group = "root";
-      setuid = true;
-    };
+    security.setuidOwners = [
+      {
+        program = "kcheckpass";
+        source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass";
+        owner = "root";
+        setuid = true;
+      }
+      {
+        program = "start_kdeinit_wrapper";
+        source = "${kde5.plasma-workspace}/lib/libexec/kf5/start_kdeinit_wrapper";
+        owner = "root";
+        setuid = true;
+      }
+    ];
 
     environment.systemPackages =
       [