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

x2goclient: 4.1.2.1 -> unstable-2018-11-30, fix build

This commit is contained in:
Averell Dalton 2018-12-05 20:30:03 +01:00 committed by worldofpeace
parent 0afa5cd443
commit 561959bab8
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/networking/remote/x2goclient/default.nix
View File

@ -1,21 +1,20 @@
{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, { stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh
makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: , makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "x2goclient-${version}"; pname = "x2goclient";
version = "4.1.2.1"; version = "unstable-2018-11-30";
src = fetchurl { src = fetchgit {
url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; url = "git://code.x2go.org/x2goclient.git";
sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w"; rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8";
sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4";
}; };
buildInputs = [ cups libssh libXpm nxproxy openldap openssh buildInputs = [ cups libssh libXpm nxproxy openldap openssh
qtbase qtsvg qtx11extras qttools phonon ]; qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
patches = [ ./qt511.patch ];
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \

15
pkgs/applications/networking/remote/x2goclient/qt511.patch
View File

@ -1,15 +0,0 @@
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