alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

duplicity: add missing 'lockfile' build input

Browse source
This commit is contained in:
Peter Simons 2014-03-08 13:28:50 +01:00
parent 01e4edbabf
commit bb37028fcc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/backup/duplicity/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }: { stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }:
let let
version = "0.6.23"; version = "0.6.23";
@ -14,10 +14,10 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
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 ${boto})" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
--prefix PATH : "${gnupg}/bin:${ncftp}/bin" --prefix PATH : "${gnupg}/bin:${ncftp}/bin"
wrapProgram $out/bin/rdiffdir \ wrapProgram $out/bin/rdiffdir \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
''; '';
buildInputs = [ python librsync makeWrapper ]; buildInputs = [ python librsync makeWrapper ];

2
pkgs/top-level/all-packages.nix
View file

@ -848,7 +848,7 @@ let
dtach = callPackage ../tools/misc/dtach { }; dtach = callPackage ../tools/misc/dtach { };
duplicity = callPackage ../tools/backup/duplicity { duplicity = callPackage ../tools/backup/duplicity {
inherit (pythonPackages) boto; inherit (pythonPackages) boto lockfile;
gnupg = gnupg1; gnupg = gnupg1;
}; };