* gnupg updated to 1.4.10. Also, build with bzip2 support. Duplicity

  can use this to better compress backups.

svn path=/nixpkgs/trunk/; revision=19915

2 files changed, 19 insertions, 20 deletions

diff --git a/pkgs/tools/security/gnupg/builder.sh b/pkgs/tools/security/gnupg/builder.sh
deleted file mode 100644
index aaf20c63899e..000000000000
--- a/pkgs/tools/security/gnupg/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-    if test -n "$idea"; then
-        gunzip < $idea > ./cipher/idea.c
-    fi
-}
-
-genericBuild
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 5e8023a582a0..dc396d9f35b3 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -1,26 +1,34 @@
-{
-  # Support for the IDEA cipher (used by the old PGP) should only be
+{ # Support for the IDEA cipher (used by the old PGP) should only be
   # enabled if it is legal for you to do so.
   ideaSupport ? false
 
-, stdenv, fetchurl, readline
+, stdenv, fetchurl, readline, bzip2
 }:
 
+let
+
+  idea = fetchurl {
+    url = http://nixos.org/tarballs/idea.c.gz;
+    md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
+  };
+
+in
+
 stdenv.mkDerivation rec {
-  name = "gnupg-1.4.9";
-  builder = ./builder.sh;
+  name = "gnupg-1.4.10";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1p86mdgij3llnkx8dvvjl19abgq86gdn6m4r6bc4xvgfjg6sp99w";
+    sha256 = "0f5v8c8fkxcnrlmnijaq2sqfqq6xhmbyi2p44pj98y6n6927z452";
   };
 
-  buildInputs = [readline];
-  idea = if ideaSupport then fetchurl {
-    url = http://nixos.org/tarballs/idea.c.gz;
-    md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
-  } else null;
+  buildInputs = [ readline bzip2 ];
 
+  preConfigure = stdenv.lib.optionalString ideaSupport
+    ''
+      gunzip < ${idea} > ./cipher/idea.c
+    '';
+  
   meta = {
     description = "A free implementation of the OpenPGP standard for encrypting and signing data";
     homepage = http://www.gnupg.org/;