From 48f97bdae0e41df8f4214932f36c8ab34927946c Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sun, 12 May 2013 16:11:54 +0200
Subject: Some kde wrapper improvements.

---
 pkgs/build-support/kdewrapper/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
index fc48161e92e2..be90011f4939 100644
--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   buildCommand = ''
     ensureDir $out/bin
 
-    KDEDIRS=
-    QT_PLUGIN_PATH=
+    KDEDIRS=${program}
+    QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
     for a in $libs; do
       KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
       QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
@@ -31,9 +31,10 @@ stdenv.mkDerivation {
     for a in ${program}/bin/*; do 
       PROG=$out/bin/`basename $a` 
     cat > $PROG << END
-      export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
-      export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
-      exec $a "\$@"
+    #!/bin/sh
+    export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
+    export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
+    exec $a "\$@"
     END
     chmod +x $PROG
     done
-- 
cgit 1.4.1