diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 87fe60c7740c..2cfbfb1b201e 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh -, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: +, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "x2goclient"; - version = "unstable-2018-11-30"; + version = "unstable-2019-07-24"; src = fetchgit { url = "git://code.x2go.org/x2goclient.git"; - rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8"; - sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4"; + rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49"; + sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f"; }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; - nativeBuildInputs = [ makeWrapper ]; postPatch = '' substituteInPlace Makefile \ @@ -28,9 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installTargets = [ "install_client" "install_man" ]; - postInstall = '' - wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nx-libs}/bin:${openssh}/libexec"; - ''; + + qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ]; meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; |