Merge pull request #41137 from symphorien/teamspeak
teamspeak_client: fix startup
This commit is contained in:
commit
22d217ca18
@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
|
||||
rm *.so.* *.so
|
||||
rm QtWebEngineProcess
|
||||
rm qt.conf
|
||||
rm -r platforms # contains libqxcb.so
|
||||
|
||||
# Install files.
|
||||
mkdir -p $out/lib/teamspeak
|
||||
@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
wrapProgram $out/bin/ts3client \
|
||||
--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
|
||||
'';
|
||||
|
||||
|
@ -18058,7 +18058,7 @@ with pkgs;
|
||||
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 { };
|
||||
|
||||
uaskjuggler = callPackage ../applications/misc/taskjuggler { };
|
||||
|
Loading…
Reference in New Issue
Block a user