diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-19 15:18:24 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-19 15:18:24 +0100 |
commit | 9b54a001601a4eaf211e411451f48ec78027378f (patch) | |
tree | 62f1d349cbfcb23467195d9f6f02d709b331674b /pkgs/tools/networking | |
parent | 4378dc92d5422a1f7bfb41869823f2a56f207e81 (diff) | |
parent | 13e6a5c56103cad7aa5ecdd8888aa9172d20a6ed (diff) | |
download | nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar.gz nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar.bz2 nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar.lz nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar.xz nixlib-9b54a001601a4eaf211e411451f48ec78027378f.tar.zst nixlib-9b54a001601a4eaf211e411451f48ec78027378f.zip |
Merge #29785: curl: enable kerberos
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c356a307e3e3..be42c4a1381a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -6,7 +6,7 @@ , sslSupport ? false, openssl ? null , gnutlsSupport ? false, gnutls ? null , scpSupport ? false, libssh2 ? null -, gssSupport ? false, gss ? null +, gssSupport ? false, kerberos ? null , c-aresSupport ? false, c-ares ? null , brotliSupport ? false, brotli ? null }: @@ -21,6 +21,7 @@ assert gnutlsSupport -> gnutls != null; assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; assert brotliSupport -> brotli != null; +assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { name = "curl-7.57.0"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ - optional gssSupport gss ++ + optional gssSupport kerberos ++ optional c-aresSupport c-ares ++ optional sslSupport openssl ++ optional gnutlsSupport gnutls ++ @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; + ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"; CXX = "c++"; CXXCPP = "c++ -E"; |