diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-09 18:44:27 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-05-09 18:44:27 +0000 |
| commit | 43615a640f0fe0dcbb4001e582e1a29bad5c8e8f (patch) | |
| tree | 6d45a5e60ca1e287db81add5cef2e7245bba6f0d /pkgs/build-support/kdewrapper | |
| parent | 4e7208fe2e956eb69a6d5fc3d5cafa7ba373f564 (diff) | |
| download | nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar.gz nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar.bz2 nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar.lz nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar.xz nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.tar.zst nixpkgs-43615a640f0fe0dcbb4001e582e1a29bad5c8e8f.zip | |
kdewrapper: fixes in env vars
Diffstat (limited to 'pkgs/build-support/kdewrapper')
| -rw-r--r-- | pkgs/build-support/kdewrapper/default.nix | 9 |
1 files 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 |