diff options
| author | Averell Dalton <averell+nixpkgs@rxd4.com> | 2018-06-22 17:32:07 +0200 |
|---|---|---|
| committer | Averell Dalton <averell+nixpkgs@rxd4.com> | 2018-06-22 17:32:07 +0200 |
| commit | 67e13d60c4de9464a48bb537479534e778a65751 (patch) | |
| tree | cc2384fe87bbf3c14315ee19f10590abc4a96931 /pkgs | |
| parent | 25ee8e0f70d510c8a828678ae6a0a9782215d0e8 (diff) | |
| download | nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar.gz nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar.bz2 nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar.lz nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar.xz nixlib-67e13d60c4de9464a48bb537479534e778a65751.tar.zst nixlib-67e13d60c4de9464a48bb537479534e778a65751.zip | |
x2goclient: fix build with qt 5.11
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/qt511.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a4d2e85a9119..f160dabc56c6 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { 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 + |