diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-19 17:56:53 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-08-19 21:55:06 +0000 |
commit | 904625852d535bbe53cadb006c9e1137ab481818 (patch) | |
tree | 9c1aecc9adc58ea96c4213ea902db23593f088e0 /pkgs/tools/networking/curl | |
parent | a17fc0337522b002166730d94e32f3b1517e0817 (diff) |
pkgsStatic: Inline more of static overlay
Diffstat (limited to 'pkgs/tools/networking/curl')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4fd754a3a6c73..5dba94abe35bc 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -9,6 +9,7 @@ , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null , gssSupport ? with stdenv.hostPlatform; ( !isWindows && + # disable gss becuase of: undefined reference to `k5_bcmp' # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 !isStatic && # the "mig" tool does not configure its compiler correctly. This could be @@ -95,15 +96,15 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - ( if wolfsslSupport then "--without-ca-fallback" else "--with-ca-fallback") + (lib.withFeature wolfsslSupport "ca-fallback") "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) - ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) - ( if brotliSupport then "--with-brotli" else "--without-brotli" ) + (lib.withFeatureAs sslSupport "ssl" openssl.dev) + (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) + (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.enableFeature ldapSupport "ldap") + (lib.enableFeature ldapSupport "ldaps") + (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeature brotliSupport "brotli") ] ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" |