x2goclient: 4.0.5.1 -> 4.1.0.0

lluchs · Mic92 · commit eba2aed324fc · 2017-09-05T15:25:51.000+01:00
Add openssh as dependency for sftp-server. When connecting, x2goclient crashes if it can't find that executable. (cherry picked from commit a8aef18)
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
+{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.0.5.1";
+  version = "4.1.0.0";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "04gdccqywas029a76k3r9zhr2mfn385i9r06cmi8mznxpczrhkl4";
+    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
   };
 
-  buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
+  buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
   nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install_client" "install_man" ];
   postInstall = ''
-    wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
+    wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin:${openssh}/libexec";
   '';
 
   meta = with stdenv.lib; {
