From a8aef188c81bc8daffb4a81e8ff3101fd8e8500a Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Mon, 4 Sep 2017 18:41:00 +0200 Subject: [PATCH] x2goclient: 4.0.5.1 -> 4.1.0.0 Add openssh as dependency for sftp-server. When connecting, x2goclient crashes if it can't find that executable. --- .../networking/remote/x2goclient/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 02a25b9a2704..3edf45d9acd9 100644 --- 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; {