diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2022-03-07 16:10:41 +0100 |
---|---|---|
committer | Maciej Krüger <mkg20001@gmail.com> | 2022-03-07 16:10:41 +0100 |
commit | 1b8636ed7c1d4d76e8520d622eb930952ef12c77 (patch) | |
tree | b6ddb6bd34d5a8a2fa4a8dd6452c5efbe45c32c6 /pkgs/applications/networking/remote | |
parent | ebaf33dd1ff8fc67b59629788f74d94b82db5442 (diff) |
x2goclient: fix #163122 crash after connection
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dfed1f5907584..bf9f59444aae4 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,21 @@ -{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: +{ lib +, fetchurl +, cups +, libssh +, libXpm +, nx-libs +, openldap +, openssh +, qt5 +, qtbase +, qtsvg +, qtx11extras +, qttools +, phonon +, pkg-config +}: -mkDerivation rec { +qt5.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; @@ -10,8 +24,24 @@ mkDerivation rec { sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; - buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkg-config ]; + buildInputs = [ + cups + libssh + libXpm + nx-libs + openldap + openssh + qtbase + qtsvg + qtx11extras + qttools + phonon + ]; + + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; postPatch = '' substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" @@ -26,7 +56,7 @@ mkDerivation rec { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; |