duplicity: add dependency on rsync

When using the rsync:// protocol, duplicity expects to find the rsync binary in the path.
Without rsync in the path, duplicity fails with the following error

    Attempt 1 failed. AttributeError: 'NoneType' object has no attribute 'rfind'

Adding rsync to the path enables the rsync:// protocol to work correctly.
This commit is contained in:
Russell O'Connor 2016-09-09 12:10:19 -04:00 committed by Bjørn Forsman
parent 63f9ef9f19
commit 8df0bb7aac

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, makeWrapper { stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, rsync, makeWrapper
}: }:
let let
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
python setup.py install --prefix=$out python setup.py install --prefix=$out
wrapProgram $out/bin/duplicity \ wrapProgram $out/bin/duplicity \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
--prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp ]}" --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
wrapProgram $out/bin/rdiffdir \ wrapProgram $out/bin/rdiffdir \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
''; '';