From faa98ce5d6c5ec34dd2c6860a2d868ebcc23358e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Feb 2010 16:51:01 +0000 Subject: [PATCH] * Duplicity needs gpg. svn path=/nixpkgs/trunk/; revision=19912 --- pkgs/tools/backup/duplicity/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 61a1ec4baf2..aacc4f35754 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, python, librsync, makeWrapper}: +{ stdenv, fetchurl, python, librsync, gnupg, makeWrapper }: + stdenv.mkDerivation { name = "duplicity-0.6.06"; @@ -9,10 +10,12 @@ stdenv.mkDerivation { installPhase = '' python setup.py install --prefix=$out - wrapProgram $out/bin/duplicity --prefix PYTHONPATH : "$(toPythonPath $out)" + wrapProgram $out/bin/duplicity \ + --prefix PYTHONPATH : "$(toPythonPath $out)" \ + --prefix PATH : "${gnupg}/bin" ''; - buildInputs = [python librsync makeWrapper]; + buildInputs = [ python librsync makeWrapper ]; meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a4f583a94f..96c5d598f1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -619,7 +619,7 @@ let }; duplicity = import ../tools/backup/duplicity { - inherit fetchurl stdenv librsync makeWrapper python; + inherit fetchurl stdenv librsync gnupg makeWrapper python; }; dvdplusrwtools = import ../tools/cd-dvd/dvd+rw-tools {