public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

teamspeak_client: Remove qt.conf to stop segfaults

Browse Source 
teamspeak_client: Use the quazip library provided by teamspeak

This commit should be squashed before being commited to nixpkgs!

Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Nathaniel Baxter 2014-08-16 18:34:09 +10:00 committed by Domen Kožar
parent 8092ce6649
commit 9c48f5160c
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -10,24 +10,9 @@ let
deps = deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb
fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio quazip fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
]; ];
quazip = stdenv.mkDerivation {
name = "quazip-0.7";
src = fetchurl {
url = "mirror://sourceforge/project/quazip/quazip/0.7/quazip-0.7.tar.gz";
sha256 = "193lfvhcpqgl2jmxxa4q3asc4xh1mqp2j2l0h8lmm2zrpzwygxca";
};
buildInputs = [ qt4 ];
preBuild = ''
qmake PREFIX="$out"
'';
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -68,7 +53,8 @@ stdenv.mkDerivation rec {
installPhase = installPhase =
'' ''
# Delete unecessary libraries - these are provided by nixos. # Delete unecessary libraries - these are provided by nixos.
rm *.so.* rm libQt*.so.*
rm qt.conf
# Install files. # Install files.
mkdir -p $out/lib/teamspeak mkdir -p $out/lib/teamspeak
@ -79,7 +65,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" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so:$out/lib/teamspeak/libquazip.so.1" \
--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
''; '';