From 67e13d60c4de9464a48bb537479534e778a65751 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 22 Jun 2018 17:32:07 +0200
Subject: [PATCH 1/2] x2goclient: fix build with qt 5.11

---
 .../networking/remote/x2goclient/default.nix      |  4 +++-
 .../networking/remote/x2goclient/qt511.patch      | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/remote/x2goclient/qt511.patch

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index a4d2e85a911..f160dabc56c 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 00000000000..8f02cd62277
--- /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
+

From 8e81c7c7a6953ef585a6c31f23402302adbc188f Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Sat, 23 Jun 2018 23:32:00 +0200
Subject: [PATCH 2/2] x2goclient: 4.1.1.1 -> 4.1.2.0

---
 pkgs/applications/networking/remote/x2goclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index f160dabc56c..a1a1f12a8c1 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -3,11 +3,11 @@ 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