diff options
| author | Peter Simons <simons@cryp.to> | 2013-01-11 15:46:10 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-01-11 15:46:10 +0100 |
| commit | b33ad366a17ceb66f73e15c614041a8094f50a1e (patch) | |
| tree | e728a9e93a13cfc165da4053f7285f27869d01dc /pkgs/tools/backup/bup | |
| parent | 56c7b9684409248df7c023c097e7f22c7ce9b787 (diff) | |
| parent | abd6be85e1254905406fbe97ed070271a101ce85 (diff) | |
| download | nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.gz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.bz2 nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.lz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.xz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.zst nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.zip | |
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs/tools/backup/bup')
| -rw-r--r-- | pkgs/tools/backup/bup/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 177daf7b8603..7062053703e8 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }: +{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper +, par2cmdline, par2Support ? false }: + +assert par2Support -> par2cmdline != null; with stdenv.lib; @@ -26,6 +29,8 @@ stdenv.mkDerivation { substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" + '' + optionalString par2Support '' + substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" ''; makeFlags = [ |