GnuTLS now introduces a dependency on gmp.

-- also removed poorly considered earlier individual patches.

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

5 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 1ee646344f4..4dc60bf9021 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -179,7 +179,7 @@ pkgs.makeOverridable
 
   libsoup = import ./desktop/libsoup {
     inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite
-      curl libgcrypt gmp;
+      curl libgcrypt;
     inherit (pkgs.gtkLibs) glib;
     inherit GConf gnome_keyring;
   };
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
index a57d4d6677c..eb63d543614 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl
-, glib, GConf, gnome_keyring, libgcrypt, gmp }:
+, glib, GConf, gnome_keyring, libgcrypt }:
 
 stdenv.mkDerivation {
   name = "libsoup-2.28.2";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     sha256 = "002kxjh6dwpps4iwly1bazxlzgqhkfszqqy26mp1gy2il3lzrlcx";
   };
   buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
-    glib GConf gnome_keyring libgcrypt gmp ];
+    glib GConf gnome_keyring libgcrypt ];
 }
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 44d1fcd582f..3d842c606f5 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/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;
 
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index d94a53816c8..8af6b2d611a 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/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";
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 30d6d45381a..edfc9f547f4 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib
 , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1
-, libgcrypt, gmp }:
+, libgcrypt }:
 stdenv.mkDerivation rec {
 
   name = "network-manager-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     "--with-crypto=gnutls" "--disable-more-warnings"
     "--with-udev-dir=\${out}/lib/udev" ];
 
-  buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt gmp ];
+  buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt ];
 
   meta = with stdenv.lib; {
     homepage = http://projects.gnome.org/NetworkManager/;