diff options
| author | Guillaume Maudoux <layus.on@gmail.com> | 2016-02-01 10:18:31 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-03 12:42:01 +0100 |
| commit | 9f358f809d1db46f3206d4a09a5366f13c93e777 (patch) | |
| tree | dfa95476fff3c1e9d77d79608b744ba29596ae07 /pkgs/tools/networking/curl | |
| parent | 0876a44169b64d4108fc5b5bd3c96843f94a4990 (diff) | |
| download | nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.gz nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.bz2 nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.lz nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.xz nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.zst nixlib-9f358f809d1db46f3206d4a09a5366f13c93e777.zip | |
Configure a default trust store for openssl
Diffstat (limited to 'pkgs/tools/networking/curl')
| -rw-r--r-- | pkgs/tools/networking/curl/7.15.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 4e533878ec18..1e91d6bd0883 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -33,12 +33,8 @@ stdenv.mkDerivation rec { sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; - # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE - postConfigure = '' - echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h - ''; - configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ] diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d5421f0a500e..bb08966ed49e 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation rec { rm src/tool_hugehelp.c ''; - # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE - postConfigure = '' - echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h - ''; - configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" "--with-nghttp2=${libnghttp2}" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) |