From cc7f5eba97907374caf91cb2a9c5499d6adfacfd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 28 Apr 2009 13:40:55 +0000
Subject: [PATCH] * Synced with trunk @ 15326

svn path=/nixos/branches/modular-nixos/; revision=15366
---
 upstart-jobs/xserver/desktopManager/kde.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/upstart-jobs/xserver/desktopManager/kde.nix
index 725e51862fab..e2ff1294d9f7 100644
--- a/upstart-jobs/xserver/desktopManager/kde.nix
+++ b/upstart-jobs/xserver/desktopManager/kde.nix
@@ -33,6 +33,15 @@ mkIf cfg.enable {
         session = [{
           name = "kde";
           start = ''
+            # A quick hack to make KDE screen locking work.  It calls
+            # kcheckpass, which needs to be setuid in order to read the
+            # shadow password file.  We have a setuid wrapper around
+            # kcheckpass.  However, startkde adds $kdebase/bin to the start
+            # of $PATH if it's not already in $PATH, thus overriding the
+            # setuid wrapper directory.  So here we add $kdebase/bin to the
+            # end of $PATH to keep startkde from doing that.
+            export PATH=$PATH:${pkgs.kdebase}/bin
+            
             # Start KDE.
             exec ${pkgs.kdebase}/bin/startkde
           '';