public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

curl: Add support for c-ares, asynchronous dns resolver

Browse Source
This commit is contained in:
Jaka Hudoklin 2013-08-08 18:33:39 +02:00 committed by Bjørn Forsman
parent 01b483f692
commit 941055dae9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/curl/default.nix
View File

@ -3,12 +3,14 @@
, sslSupport ? false, openssl ? null , sslSupport ? false, openssl ? null
, scpSupport ? false, libssh2 ? null , scpSupport ? false, libssh2 ? null
, gssSupport ? false, gss ? null , gssSupport ? false, gss ? null
, c-aresSupport ? false, c-ares ? null
, linkStatic ? false , linkStatic ? false
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert scpSupport -> libssh2 != null; assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.30.0"; name = "curl-7.30.0";
@ -24,6 +26,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with stdenv.lib; propagatedBuildInputs = with stdenv.lib;
optional zlibSupport zlib ++ optional zlibSupport zlib ++
optional gssSupport gss ++ optional gssSupport gss ++
optional c-aresSupport c-ares ++
optional sslSupport openssl; optional sslSupport openssl;
preConfigure = '' preConfigure = ''
@ -33,6 +36,7 @@ stdenv.mkDerivation rec {
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( 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.optional gssSupport "--with-gssapi=${gss}"
++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
; ;

4
pkgs/top-level/all-packages.nix
View File

@ -3777,7 +3777,9 @@ let
bwidget = callPackage ../development/libraries/bwidget { }; 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 { }; caelum = callPackage ../development/libraries/caelum { };