kdewrapper: fixes in env vars

This commit is contained in:
Lluís Batlle i Rossell 2013-05-09 18:44:27 +00:00
parent 4e7208fe2e
commit 43615a640f

View File

@ -11,7 +11,8 @@
program: program:
let 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
name = program.name + "-wrapped"; name = program.name + "-wrapped";
@ -25,13 +26,13 @@ stdenv.mkDerivation {
QT_PLUGIN_PATH= QT_PLUGIN_PATH=
for a in $libs; do for a in $libs; do
KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS 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 done
for a in ${program}/bin/*; do for a in ${program}/bin/*; do
PROG=$out/bin/`basename $a` PROG=$out/bin/`basename $a`
cat > $PROG << END cat > $PROG << END
export KDEDIRS=$KDEDIRS export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
export QT_PLUGIN_PATH=$KDEDIRS export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
exec $a "\$@" exec $a "\$@"
END END
chmod +x $PROG chmod +x $PROG