diff options
| author | Karn Kallio <tierpluspluslists@gmail.com> | 2011-04-13 02:02:11 +0000 |
|---|---|---|
| committer | Karn Kallio <tierpluspluslists@gmail.com> | 2011-04-13 02:02:11 +0000 |
| commit | e29d509152d6dabe14b7cf6fdad2644cfa38b0a1 (patch) | |
| tree | 9cf414596419e11b641557a38208270775ff5dcd /pkgs/development | |
| parent | d86630472bf9c5939cae8d985e677c43c2575c0b (diff) | |
| download | nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar.gz nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar.bz2 nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar.lz nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar.xz nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.tar.zst nixlib-e29d509152d6dabe14b7cf6fdad2644cfa38b0a1.zip | |
Move the gmp dependency to nettle, where it originates.
As pointed out by Ludovic Courtès. svn path=/nixpkgs/trunk/; revision=26812
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 4 | ||||
| -rw-r--r-- | 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"); |