GnuTLS now introduces a dependency on gmp.

-- also removed poorly considered earlier individual patches.

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

pkgs/development/libraries/gnutls/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, zlib, lzo, libtasn1, nettle
-, guileBindings, guile }:
+, guileBindings, guile, gmp }:
 
 assert guileBindings -> guile != null;
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib lzo libtasn1 ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  propagatedBuildInputs = [ nettle ];
+  propagatedBuildInputs = [ nettle gmp ];
 
   doCheck = true;
 

pkgs/development/libraries/libimobiledevice/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
-  libtasn1, libplist, readline, gmp }:
+  libtasn1, libplist, readline }:
 
 stdenv.mkDerivation rec {
   name = "libimobiledevice-1.0.2";
 
-  buildInputs = [ python swig pkgconfig readline gmp ];
+  buildInputs = [ python swig pkgconfig readline ];
   propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
 
   configureFlags = "--enable-dev-tools";