From e29d509152d6dabe14b7cf6fdad2644cfa38b0a1 Mon Sep 17 00:00:00 2001 From: Karn Kallio <tierpluspluslists@gmail.com> Date: Wed, 13 Apr 2011 02:02:11 +0000 Subject: [PATCH] =?UTF-8?q?Move=20the=20gmp=20dependency=20to=20nettle,=20?= =?UTF-8?q?where=20it=20originates.=20As=20pointed=20out=20by=20Ludovic=20?= =?UTF-8?q?Court=C3=A8s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=26812 --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- pkgs/development/libraries/nettle/default.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3d842c606f5e..44d1fcd582ff 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, gmp }: +, guileBindings, guile }: assert guileBindings -> guile != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo libtasn1 ] ++ stdenv.lib.optional guileBindings guile; - propagatedBuildInputs = [ nettle gmp ]; + propagatedBuildInputs = [ nettle ]; doCheck = true; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 4f0c47317233..0c8fb00ec6fe 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0knp778738dpgbcj1yz54a7jsvmarfiafzl05z086bc470z6plmp"; }; - buildInputs = [ gmp gnum4 ]; + buildInputs = [ gnum4 ]; + propagatedBuildInputs = [ gmp ]; doCheck = (stdenv.system != "i686-cygwin");