From 49ba7bee3c4beeacb8ea3f4dfc1f2bd0893499e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 6 Mar 2010 15:17:43 +0000 Subject: [PATCH] Made curl cross-build properly with openssl support. svn path=/nixpkgs/trunk/; revision=20452 --- pkgs/tools/networking/curl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 1cd9b43309f..0cfd6adef86 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -34,6 +34,16 @@ stdenv.mkDerivation rec { # other LDFLAGS, because it doesn't use libtool for linking in the tests. makeFlags = if linkStatic then "LDFLAGS=-all-static" else ""; + crossAttrs = { + # We should refer to the cross built openssl + # For the 'urandom', maybe it should be a cross-system option + configureFlags = '' + ${if sslSupport then "--with-ssl=${openssl.hostDrv}" else "--without-ssl"} + ${if linkStatic then "--enable-static --disable-shared" else ""} + --with-random /dev/urandom + ''; + }; + passthru = { inherit sslSupport openssl; };