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

Merge pull request #4184 from nathanielbaxter/dev/teamspeak_client

Browse Source 
teamspeak client: Use nixpkgs libquazip. Remove qt4 dependancy.
This commit is contained in:
Domen Kožar 2014-09-20 19:27:41 +02:00
commit 1cbcd2baae
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, makeWrapper, xlibs { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
, qt5, pulseaudio ? null, qt4, xkeyboard_config, libredirect }: , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
, libredirect, quazip
}:
let let
@ -9,8 +11,8 @@ 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
fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
]; ];
in in
@ -53,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.
@ -65,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
''; '';