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

curl: use the "kerberos" package rather than specifically GNU gss 

This allows a policy decision about which Kerberos to use.
This commit is contained in:
Spencer Baugh 2017-09-25 19:53:52 +00:00
parent 416979f3f7
commit 75353853fc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
, sslSupport ? false, openssl ? null , sslSupport ? false, openssl ? null
, gnutlsSupport ? false, gnutls ? null , gnutlsSupport ? false, gnutls ? null
, scpSupport ? false, libssh2 ? null , scpSupport ? false, libssh2 ? null
, gssSupport ? false, gss ? null , gssSupport ? false, kerberos ? null
, c-aresSupport ? false, c-ares ? null , c-aresSupport ? false, c-ares ? null
}: }:
@ -19,6 +19,7 @@ assert !(gnutlsSupport && sslSupport);
assert gnutlsSupport -> gnutls != null; assert gnutlsSupport -> gnutls != null;
assert scpSupport -> libssh2 != null; assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null; assert c-aresSupport -> c-ares != null;
assert gssSupport -> kerberos != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.56.0"; name = "curl-7.56.0";
@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
optional idnSupport libidn ++ optional idnSupport libidn ++
optional ldapSupport openldap ++ optional ldapSupport openldap ++
optional zlibSupport zlib ++ optional zlibSupport zlib ++
optional gssSupport gss ++ optional gssSupport kerberos ++
optional c-aresSupport c-ares ++ optional c-aresSupport c-ares ++
optional sslSupport openssl ++ optional sslSupport openssl ++
optional gnutlsSupport gnutls ++ optional gnutlsSupport gnutls ++
@ -66,7 +67,7 @@ stdenv.mkDerivation rec {
( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
] ]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos}";
CXX = "c++"; CXX = "c++";
CXXCPP = "c++ -E"; CXXCPP = "c++ -E";