x2goclient: fix #163122 crash after connection
This commit is contained in:
parent
ebaf33dd1f
commit
1b8636ed7c
1 changed files with 36 additions and 6 deletions
|
@ -1,7 +1,21 @@
|
||||||
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
|
{ lib
|
||||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
, fetchurl
|
||||||
|
, cups
|
||||||
|
, libssh
|
||||||
|
, libXpm
|
||||||
|
, nx-libs
|
||||||
|
, openldap
|
||||||
|
, openssh
|
||||||
|
, qt5
|
||||||
|
, qtbase
|
||||||
|
, qtsvg
|
||||||
|
, qtx11extras
|
||||||
|
, qttools
|
||||||
|
, phonon
|
||||||
|
, pkg-config
|
||||||
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
qt5.mkDerivation rec {
|
||||||
pname = "x2goclient";
|
pname = "x2goclient";
|
||||||
version = "4.1.2.2";
|
version = "4.1.2.2";
|
||||||
|
|
||||||
|
@ -10,8 +24,24 @@ mkDerivation rec {
|
||||||
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
|
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
buildInputs = [
|
||||||
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
cups
|
||||||
|
libssh
|
||||||
|
libXpm
|
||||||
|
nx-libs
|
||||||
|
openldap
|
||||||
|
openssh
|
||||||
|
qtbase
|
||||||
|
qtsvg
|
||||||
|
qtx11extras
|
||||||
|
qttools
|
||||||
|
phonon
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
qt5.wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
|
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
|
||||||
|
@ -26,7 +56,7 @@ mkDerivation rec {
|
||||||
|
|
||||||
installTargets = [ "install_client" "install_man" ];
|
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; {
|
meta = with lib; {
|
||||||
description = "Graphical NoMachine NX3 remote desktop client";
|
description = "Graphical NoMachine NX3 remote desktop client";
|
||||||
|
|
Loading…
Reference in a new issue