mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 11:23:29 +00:00
teamspeak_client: Use nixpkgs quazip instead of provided library.
This commit is contained in:
parent
afb405aed5
commit
72d43c3e04
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
|
{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
|
||||||
, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
|
, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
|
||||||
, libredirect
|
, libredirect, quazip
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||||||
installPhase =
|
installPhase =
|
||||||
''
|
''
|
||||||
# Delete unecessary libraries - these are provided by nixos.
|
# Delete unecessary libraries - these are provided by nixos.
|
||||||
rm libQt*.so.*
|
rm *.so.*
|
||||||
rm qt.conf
|
rm qt.conf
|
||||||
|
|
||||||
# Install files.
|
# Install files.
|
||||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||||||
ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
|
ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
|
||||||
|
|
||||||
wrapProgram $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 QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
|
||||||
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
|
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user