diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-24 20:30:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 20:30:37 +0200 |
| commit | 7d7b2de34db73ce7e4ec91b43226fef222866313 (patch) | |
| tree | d1fe306b499a8845b83a4b1dc716b27ccde1c7c0 /pkgs/applications/networking | |
| parent | 8cf8c4bac28e5305b08bc1b636fa26597bd8279f (diff) | |
| parent | 8e81c7c7a6953ef585a6c31f23402302adbc188f (diff) | |
| download | nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar.gz nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar.bz2 nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar.lz nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar.xz nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.tar.zst nixlib-7d7b2de34db73ce7e4ec91b43226fef222866313.zip | |
Merge pull request #42382 from averelld/x2goclient-qt511-fixes
x2goclient: fix build with qt 5.11
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/qt511.patch | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a4d2e85a9119..a1a1f12a8c1c 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.1.1"; + version = "4.1.2.0"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; + sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + patches = [ ./qt511.patch ]; + + postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch new file mode 100644 index 000000000000..8f02cd62277d --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/printwidget.cpp b/src/printwidget.cpp +index 58a8af7..131d340 100644 +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include <QDir> ++#include <QButtonGroup> + #ifdef Q_OS_WIN + #include "wapi.h" + #endif +-- +2.17.1 + |