diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d7dc755e9abb..3870533aa89b 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, makeWrapper, xlibs -, qt5, pulseaudio ? null, qt4, xkeyboard_config, libredirect }: +{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg +, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null +, libredirect, quazip +}: let @@ -9,8 +11,8 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender - xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb - fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio + xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama + xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio ]; in @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { installPhase = '' # Delete unecessary libraries - these are provided by nixos. - rm libQt*.so.* + rm *.so.* rm qt.conf # Install files. @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client wrapProgram $out/bin/ts3client \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so:$out/lib/teamspeak/libquazip.so.1" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \ --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb '';