pyrox.dev
Merge pull request #42382 from averelld/x2goclient-qt511-fixes
x2goclient: fix build with qt 5.11
+5
-3
pkgs/applications/networking/remote/x2goclient/default.nix
+5
-3
pkgs/applications/networking/remote/x2goclient/default.nix
···
3
4
stdenv.mkDerivation rec {
5
name = "x2goclient-${version}";
6
-
version = "4.1.1.1";
7
8
src = fetchurl {
9
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
10
-
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
11
};
12
13
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
14
qtbase qtsvg qtx11extras qttools phonon ];
15
nativeBuildInputs = [ makeWrapper ];
16
17
-
patchPhase = ''
18
substituteInPlace Makefile \
19
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
20
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
···
3
4
stdenv.mkDerivation rec {
5
name = "x2goclient-${version}";
6
+
version = "4.1.2.0";
7
8
src = fetchurl {
9
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
10
+
sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn";
11
};
12
13
buildInputs = [ cups libssh libXpm nxproxy openldap openssh
14
qtbase qtsvg qtx11extras qttools phonon ];
15
nativeBuildInputs = [ makeWrapper ];
16
17
+
patches = [ ./qt511.patch ];
18
+
19
+
postPatch = ''
20
substituteInPlace Makefile \
21
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
22
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
+15
pkgs/applications/networking/remote/x2goclient/qt511.patch
+15
pkgs/applications/networking/remote/x2goclient/qt511.patch
···
···
1
+
diff --git a/src/printwidget.cpp b/src/printwidget.cpp
2
+
index 58a8af7..131d340 100644
3
+
--- a/src/printwidget.cpp
4
+
+++ b/src/printwidget.cpp
5
+
@@ -23,6 +23,7 @@
6
+
#include "x2gosettings.h"
7
+
#include "x2gologdebug.h"
8
+
#include <QDir>
9
+
+#include <QButtonGroup>
10
+
#ifdef Q_OS_WIN
11
+
#include "wapi.h"
12
+
#endif
13
+
--
14
+
2.17.1
15
+