tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
x2goclient: fix #163122 crash after connection
Maciej Krüger
4 years ago
1b8636ed
ebaf33dd
+36
-6
1 changed file
expand all
collapse all
unified
split
pkgs
applications
networking
remote
x2goclient
default.nix
+36
-6
pkgs/applications/networking/remote/x2goclient/default.nix
···
1
1
-
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
2
2
-
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
1
1
+
{ lib
2
2
+
, fetchurl
3
3
+
, cups
4
4
+
, libssh
5
5
+
, libXpm
6
6
+
, nx-libs
7
7
+
, openldap
8
8
+
, openssh
9
9
+
, qt5
10
10
+
, qtbase
11
11
+
, qtsvg
12
12
+
, qtx11extras
13
13
+
, qttools
14
14
+
, phonon
15
15
+
, pkg-config
16
16
+
}:
3
17
4
4
-
mkDerivation rec {
18
18
+
qt5.mkDerivation rec {
5
19
pname = "x2goclient";
6
20
version = "4.1.2.2";
7
21
···
10
24
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
11
25
};
12
26
13
13
-
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
14
14
-
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
27
27
+
buildInputs = [
28
28
+
cups
29
29
+
libssh
30
30
+
libXpm
31
31
+
nx-libs
32
32
+
openldap
33
33
+
openssh
34
34
+
qtbase
35
35
+
qtsvg
36
36
+
qtx11extras
37
37
+
qttools
38
38
+
phonon
39
39
+
];
40
40
+
41
41
+
nativeBuildInputs = [
42
42
+
pkg-config
43
43
+
qt5.wrapQtAppsHook
44
44
+
];
15
45
16
46
postPatch = ''
17
47
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
···
26
56
27
57
installTargets = [ "install_client" "install_man" ];
28
58
29
29
-
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
59
59
+
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ];
30
60
31
61
meta = with lib; {
32
62
description = "Graphical NoMachine NX3 remote desktop client";