From 43615a640f0fe0dcbb4001e582e1a29bad5c8e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 9 May 2013 18:44:27 +0000
Subject: [PATCH] kdewrapper: fixes in env vars

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

diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
index a9418ba1f96..fc48161e92e 100644
--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@@ -11,7 +11,8 @@
 program:
 
 let
-  libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ] + extra;
+  libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ]
+    ++ extraLibs;
 in
 stdenv.mkDerivation {
   name = program.name + "-wrapped";
@@ -25,13 +26,13 @@ stdenv.mkDerivation {
     QT_PLUGIN_PATH=
     for a in $libs; do
       KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
-      QT_PLUGIN_PATH=$a''${KDEDIRS:+:}$KDEDIRS
+      QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
     done
     for a in ${program}/bin/*; do 
       PROG=$out/bin/`basename $a` 
     cat > $PROG << END
-      export KDEDIRS=$KDEDIRS
-      export QT_PLUGIN_PATH=$KDEDIRS
+      export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
+      export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
       exec $a "\$@"
     END
     chmod +x $PROG