From 7ed15eed532a7d9cf267882d5f935f1b34a04622 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 27 May 2018 15:13:23 +0200 Subject: [PATCH] teamspeak_client: fix startup segfaults with qt5.10, downgrade to 5.9 tries to load its homegrown libqxcb.so which does not find some libs, use nixpkgs libqxcb.so instead. --- .../networking/instant-messengers/teamspeak/client.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ea2030e964b..23d2e640b4f 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19e956e7a7..61680ab0511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18133,7 +18133,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 { };