about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
authorNathaniel Baxter <nathaniel.baxter@gmail.com>2014-09-12 23:26:19 +1000
committerNathaniel Baxter <nathaniel.baxter@gmail.com>2014-09-16 09:17:16 +1000
commit72d43c3e04ca0d3834518d53d3ba82e814b9f34f (patch)
tree66e071cd4575ec26c7a68a0784a4fca11d793c6e /pkgs/applications/networking/instant-messengers
parentafb405aed5ccd8402c52ded52d5feec1723f299b (diff)
downloadnixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar.gz
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar.bz2
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar.lz
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar.xz
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.tar.zst
nixlib-72d43c3e04ca0d3834518d53d3ba82e814b9f34f.zip
teamspeak_client: Use nixpkgs quazip instead of provided library.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 11a462f5b19b..3870533aa89b 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
 , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
-, libredirect
+, libredirect, quazip
 }:
 
 let
@@ -55,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.
@@ -67,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
     '';