Merge pull request #28983 from lluchs/x2goclient-4.1.0.0
x2goclient: 4.0.5.1 -> 4.1.0.0
This commit is contained in:
commit
e342715f3e
@ -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; {
|
||||
|
Loading…
Reference in New Issue
Block a user