Merge pull request #15282 from nathanielbaxter/dev/teamspeak

teamspeak_client: 3.0.18.2 -> 3.0.19.1
This commit is contained in:
Joachim Fasting 2016-05-07 18:51:28 +02:00
commit cac498b522
1 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
, xorg, fontconfig, qtbase, xkeyboard_config, alsaLib, libpulseaudio ? null , xorg, fontconfig, qtbase, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which, unzip , libredirect, quazip, less, which, unzip, llvmPackages
}: }:
let let
@ -13,6 +13,7 @@ let
[ 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 xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase libpulseaudio xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase libpulseaudio
llvmPackages.libcxx llvmPackages.libcxxabi
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -30,7 +31,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "teamspeak-client-${version}"; name = "teamspeak-client-${version}";
version = "3.0.18.2"; version = "3.0.19.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -38,14 +39,14 @@ stdenv.mkDerivation rec {
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
]; ];
sha256 = if stdenv.is64bit sha256 = if stdenv.is64bit
then "1r0l0jlng1fz0cyvnfa4hqwlszfraj5kcs2lg9qnqvp03x8sqn6h" then "173mcvrckia0mming1v9nzi0bllr4m430y9swl9kyfsvp44f5n5h"
else "1pgpsv1r216l76fx0grlqmldd9gha3sj84gnm44km8y98b3hj525"; else "1iansjlbalwil0nlrlxfl70zzbx009c4rccf4va0kq097rqhgznx";
}; };
# grab the plugin sdk for the desktop icon # grab the plugin sdk for the desktop icon
pluginsdk = fetchurl { pluginsdk = fetchurl {
url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.18.1.zip"; url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.19.1.zip";
sha256 = "108y52mfg44cnnhhipnmrr0cxh7ram5c2hnchxjkwvf5766vbaq4"; sha256 = "1r1ss6zq5axr7h82inlp98zaz50041rizli5bwz3lfyipfr034ya";
}; };
buildInputs = [ makeWrapper less which unzip ]; buildInputs = [ makeWrapper less which unzip ];