diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-11-19 14:45:02 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-11-19 23:50:48 +0100 |
| commit | f4ab3dc223ede44cb9d20ed0638d7528219b04fa (patch) | |
| tree | 67df6dcf743c4f2152e8c8a7a21ea3b230dfb297 /pkgs/tools/networking/curl | |
| parent | 48032400ca160db16dccbcee324a19678beeeb9e (diff) | |
| download | nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar.gz nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar.bz2 nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar.lz nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar.xz nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.tar.zst nixlib-f4ab3dc223ede44cb9d20ed0638d7528219b04fa.zip | |
libcurl: Honor $SSL_CERT_FILE
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 | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 0a87eaa944cd..df42b7d290ea 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { preConfigure = '' 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 = [ ( 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 85b935ebd767..f055680a2f0c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -36,6 +36,11 @@ 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("SSL_CERT_FILE"))' >> lib/curl_config.h + ''; + configureFlags = [ ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) |