diff options
| author | Averell Dalton <averell+nixpkgs@rxd4.com> | 2018-12-05 20:30:03 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-12-05 20:38:08 -0500 |
| commit | 561959bab88c589b6e3bd02c1ca1f8f7674864b7 (patch) | |
| tree | cc83c2f49d4cddad3d32e3f222a853002588901e /pkgs/applications/networking/remote/x2goclient | |
| parent | 0afa5cd443d7e8920b922ccfabf047f4d3d6d5cc (diff) | |
x2goclient: 4.1.2.1 -> unstable-2018-11-30, fix build
Diffstat (limited to 'pkgs/applications/networking/remote/x2goclient')
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/x2goclient/qt511.patch | 15 |
2 files changed, 9 insertions, 25 deletions
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 01aaa2219bf38..3d65b7a621b3d 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, -makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: +{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh +, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: stdenv.mkDerivation rec { - name = "x2goclient-${version}"; - version = "4.1.2.1"; + pname = "x2goclient"; + version = "unstable-2018-11-30"; - src = fetchurl { - url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w"; + src = fetchgit { + url = "git://code.x2go.org/x2goclient.git"; + rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8"; + sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh - qtbase qtsvg qtx11extras qttools phonon ]; + qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; nativeBuildInputs = [ makeWrapper ]; - patches = [ ./qt511.patch ]; - postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch deleted file mode 100644 index 8f02cd62277d6..0000000000000 --- a/pkgs/applications/networking/remote/x2goclient/qt511.patch +++ /dev/null @@ -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 - |