From f3c869223275676ed57d7cc9f020bff72095516f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:59:47 +0100 Subject: [PATCH] rdiff-backup: use python2 and buildPythonApplication --- pkgs/tools/backup/rdiff-backup/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 1c313beae9fd..f3910893b7b2 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, python, librsync, gnused }: +{stdenv, fetchurl, python2Packages, librsync, gnused }: -stdenv.mkDerivation { +python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; src = fetchurl { @@ -10,15 +10,9 @@ stdenv.mkDerivation { patches = [ ./fix-librsync-rs_default_strong_len.patch ]; - installPhase = '' - python ./setup.py install --prefix=$out - sed -i $out/bin/rdiff-backup -e \ - "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" - sed -i $out/bin/rdiff-backup-statistics -e \ - "/import .*sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" - ''; + buildInputs = [ librsync gnused ]; - buildInputs = [ python librsync gnused ]; + doCheck = false; meta = { description = "Backup system trying to combine best a mirror and an incremental backup system";