Added OpenSSL gmp propagation; libtool dependency to elinks

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

3 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 1e7868481338..9804f758ba7d 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -8,7 +8,11 @@ stdenv.mkDerivation {
     sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1";
   };
 
-  buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile];
+  preConfigure = "
+  	touch config.log ; rm /tmp/elinks.config.log; ln -f config.log /tmp/elinks.config.log";
+
+  buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile
+  	libtool];
   configureFlags = "--enable-finger --enable-html-highlight --with-guile
   --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
   --enable-nntp --with-openssl=${openssl}";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index a4f09612f9b5..e1dbc274aeda 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl}: stdenv.mkDerivation {
+args: with args; stdenv.mkDerivation {
   name = "openssl-0.9.8g";
   builder = ./builder.sh;
   src = fetchurl {
@@ -6,4 +6,5 @@
     sha256 = "1w0wj3pgg9ga0hay3jdxs9sl17bfw307b6qvkxn735fy8ml8h9hf";
   };
   buildInputs = [perl];
+  propagatedBuildInputs = [gmp];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cb2050f2a15..ac1d0ec6df56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2146,7 +2146,7 @@ rec {
   };
 
   openssl = import ../development/libraries/openssl {
-    inherit fetchurl stdenv perl;
+    inherit fetchurl stdenv perl gmp;
   };
 
   pangoxsl = import ../development/libraries/pangoxsl {
@@ -3597,7 +3597,7 @@ rec {
 
   elinks = import ../applications/networking/browsers/elinks {
     inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey
-	guile bzip2;
+	guile bzip2 libtool;
   };
 
   emacs = emacs22;