diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 0c4f4b494fb0..2460573310c6 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,5 @@ -args: with args; +{stdenv, fetchurl, python, librsync, gnused }: + stdenv.mkDerivation { name = "rdiff-backup-1.1.14"; @@ -7,9 +8,9 @@ stdenv.mkDerivation { sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h"; }; - phases = "installPhase"; + phases = "unpackPhase installPhase"; installPhase = '' - python setup.py install --prefix=$out + python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6704c85b19b5..26c650d0a7f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1227,10 +1227,7 @@ let replace = callPackage ../tools/text/replace { }; - /* - rdiff_backup = callPackage ../tools/backup/rdiff-backup { - python=python; }; - */ + rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; ripmime = callPackage ../tools/networking/ripmime {};