diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-12 16:11:54 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-14 18:51:24 +0200 |
| commit | 48f97bdae0e41df8f4214932f36c8ab34927946c (patch) | |
| tree | a469fc6077862d69379d2da92096e26bfbfbcbe5 /pkgs/build-support | |
| parent | c887f9e9327cc4d9c6532eb709697bd0d73d557b (diff) | |
| download | nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar.gz nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar.bz2 nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar.lz nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar.xz nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.tar.zst nixlib-48f97bdae0e41df8f4214932f36c8ab34927946c.zip | |
Some kde wrapper improvements.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kdewrapper/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
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 |