alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #10372 from nathanielbaxter/dev/teamspeak_client

Browse source 
teamspeak_client: Fixed qt and quazip lib references.
This commit is contained in:
Peter Simons 2015-10-13 14:08:44 +02:00
parent cb9e2a712c 102f70bfb2
commit 424be52044
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
, xorg, fontconfig, qt55, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which, unzip
}:
@ -12,7 +12,7 @@ let
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt55.qtbase libpulseaudio
];
desktopItem = makeDesktopItem {
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
installPhase =
''
# Delete unecessary libraries - these are provided by nixos.
rm *.so.*
rm *.so.* *.so
rm qt.conf
# Install files.
@ -89,7 +89,8 @@ stdenv.mkDerivation rec {
ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
wrapProgram $out/bin/ts3client \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \
--set LD_LIBRARY_PATH "${quazip}/lib" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
'';