curl: Optionally add support for GSSAPI (Kerberos).
@vcunat also did some configureFlags refactoring
This commit is contained in:
parent
7959eaf8dd
commit
7abebbad4d
@ -2,6 +2,7 @@
|
|||||||
, zlibSupport ? false, zlib ? null
|
, zlibSupport ? false, zlib ? null
|
||||||
, sslSupport ? false, openssl ? null
|
, sslSupport ? false, openssl ? null
|
||||||
, scpSupport ? false, libssh2 ? null
|
, scpSupport ? false, libssh2 ? null
|
||||||
|
, gssSupport ? false, gss ? null
|
||||||
, linkStatic ? false
|
, linkStatic ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -20,15 +21,21 @@ stdenv.mkDerivation rec {
|
|||||||
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
|
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
|
||||||
# "-lz -lssl", which aren't necessary direct build inputs of
|
# "-lz -lssl", which aren't necessary direct build inputs of
|
||||||
# applications that use Curl.
|
# applications that use Curl.
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs = with stdenv.lib;
|
||||||
stdenv.lib.optional zlibSupport zlib ++
|
optional zlibSupport zlib ++
|
||||||
stdenv.lib.optional sslSupport openssl;
|
optional gssSupport gss ++
|
||||||
|
optional sslSupport openssl;
|
||||||
|
|
||||||
configureFlags = ''
|
preConfigure = ''
|
||||||
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
|
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
|
||||||
${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
|
|
||||||
${if linkStatic then "--enable-static --disable-shared" else ""}
|
|
||||||
'';
|
'';
|
||||||
|
configureFlags = [
|
||||||
|
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
|
||||||
|
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
|
||||||
|
]
|
||||||
|
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"
|
||||||
|
++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
|
||||||
|
;
|
||||||
|
|
||||||
dontDisableStatic = linkStatic;
|
dontDisableStatic = linkStatic;
|
||||||
|
|
||||||
@ -44,21 +51,18 @@ stdenv.mkDerivation rec {
|
|||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
# We should refer to the cross built openssl
|
# We should refer to the cross built openssl
|
||||||
# For the 'urandom', maybe it should be a cross-system option
|
# For the 'urandom', maybe it should be a cross-system option
|
||||||
configureFlags = ''
|
configureFlags = [
|
||||||
${if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl"}
|
( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
|
||||||
${if linkStatic then "--enable-static --disable-shared" else ""}
|
"--with-random /dev/urandom"
|
||||||
--with-random /dev/urandom
|
]
|
||||||
'';
|
++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
|
||||||
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit sslSupport openssl;
|
inherit sslSupport openssl;
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://curl.haxx.se/";
|
homepage = "http://curl.haxx.se/";
|
||||||
description = "A command line tool for transferring files with URL syntax";
|
description = "A command line tool for transferring files with URL syntax";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user