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

Merge pull request #41137 from symphorien/teamspeak

Browse Source 
teamspeak_client: fix startup
This commit is contained in:
Sarah Brofeldt 2018-05-28 22:42:46 +02:00 committed by GitHub
commit 22d217ca18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
rm *.so.* *.so rm *.so.* *.so
rm QtWebEngineProcess rm QtWebEngineProcess
rm qt.conf rm qt.conf
rm -r platforms # contains libqxcb.so
# Install files. # Install files.
mkdir -p $out/lib/teamspeak mkdir -p $out/lib/teamspeak
@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/ts3client \ wrapProgram $out/bin/ts3client \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \ --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -18058,7 +18058,7 @@ with pkgs;
gconf = gnome2.GConf; gconf = gnome2.GConf;
}; };
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
uaskjuggler = callPackage ../applications/misc/taskjuggler { }; uaskjuggler = callPackage ../applications/misc/taskjuggler { };