diff options
author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-08-16 18:34:09 +1000 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-08-16 20:13:29 +0200 |
commit | 9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0 (patch) | |
tree | 4da607593bf0d891e65ec3f75ead88f75e055309 | |
parent | 8092ce664993830c39aa5e593dc9979b174ff50a (diff) | |
download | nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar.gz nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar.bz2 nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar.lz nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar.xz nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.tar.zst nixpkgs-9c48f5160c4a6106a3bc5bbaf733ca35c29a93a0.zip |
teamspeak_client: Remove qt.conf to stop segfaults
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>
-rw-r--r-- | pkgs/applications/networking/instant-messengers/teamspeak/client.nix | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index e7791d762c5..eb052af1369 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -10,24 +10,9 @@ 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 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 stdenv.mkDerivation rec { @@ -68,7 +53,8 @@ stdenv.mkDerivation rec { installPhase = '' # Delete unecessary libraries - these are provided by nixos. - rm *.so.* + rm libQt*.so.* + rm qt.conf # Install files. mkdir -p $out/lib/teamspeak @@ -79,7 +65,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/teamspeak/ts3client $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 NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; |