diff options
author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2015-10-13 22:12:41 +1100 |
---|---|---|
committer | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2015-10-13 22:12:41 +1100 |
commit | 102f70bfb2f0aacae281d7ffda876aabad7b253a (patch) | |
tree | 0329f019e8b7805564756fd6b5524e5549456cd3 /pkgs/applications/networking/instant-messengers/teamspeak | |
parent | 34741b84fe4ea1f27cfeb7910660b166e68f5e3a (diff) | |
download | nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar.gz nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar.bz2 nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar.lz nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar.xz nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.tar.zst nixlib-102f70bfb2f0aacae281d7ffda876aabad7b253a.zip |
teamspeak_client: Fixed qt and quazip lib references.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/teamspeak')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/teamspeak/client.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d6c645e2f2c5..a18ffac5d63d 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype -, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null +, xorg, fontconfig, qt55, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which, unzip }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt55.qtbase libpulseaudio ]; desktopItem = makeDesktopItem { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { installPhase = '' # Delete unecessary libraries - these are provided by nixos. - rm *.so.* + rm *.so.* *.so rm qt.conf # Install files. @@ -89,7 +89,8 @@ stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client wrapProgram $out/bin/ts3client \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \ + --set LD_LIBRARY_PATH "${quazip}/lib" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; |