From 941055dae9bd78493003c91a3e8e00e6f3697b59 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 8 Aug 2013 18:33:39 +0200 Subject: [PATCH] curl: Add support for c-ares, asynchronous dns resolver --- pkgs/tools/networking/curl/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 73dcb44269c..40e2d970622 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,12 +3,14 @@ , sslSupport ? false, openssl ? null , scpSupport ? false, libssh2 ? null , gssSupport ? false, gss ? null +, c-aresSupport ? false, c-ares ? null , linkStatic ? false }: assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; +assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { name = "curl-7.30.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with stdenv.lib; optional zlibSupport zlib ++ optional gssSupport gss ++ + optional c-aresSupport c-ares ++ optional sslSupport openssl; preConfigure = '' @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ] + ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afff21ee292..5270cc4cf9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3777,7 +3777,9 @@ let bwidget = callPackage ../development/libraries/bwidget { }; - c-ares = callPackage ../development/libraries/c-ares { }; + c-ares = callPackage ../development/libraries/c-ares { + fetchurl = fetchurlBoot; + }; caelum = callPackage ../development/libraries/caelum { };