public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42382 from averelld/x2goclient-qt511-fixes

Browse Source 
x2goclient: fix build with qt 5.11
This commit is contained in:
xeji
2018-06-24 20:30:37 +02:00
committed by GitHub
parent 8cf8c4bac2 8e81c7c7a6
commit 7d7b2de34d
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/remote/x2goclient/default.nix
+5 -3
View File
@@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "x2goclient-${version}"; name = "x2goclient-${version}";
version = "4.1.1.1"; version = "4.1.2.0";
src = fetchurl { src = fetchurl {
url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn";
}; };
buildInputs = [ cups libssh libXpm nxproxy openldap openssh buildInputs = [ cups libssh libXpm nxproxy openldap openssh
qtbase qtsvg qtx11extras qttools phonon ]; qtbase qtsvg qtx11extras qttools phonon ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
patchPhase = '' patches = [ ./qt511.patch ];
postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
pkgs/applications/networking/remote/x2goclient/qt511.patch
+15
View File
@@ -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