diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13 17:09:10 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13 17:09:10 +0200 |
commit | fb2dd3210072a03526e881cd2547cf4c2df4ba52 (patch) | |
tree | 3d44c43f4d05a3f038b7e25e070dd50aef69bfa9 /src | |
parent | 816d3e57248da2ce4976ae9f8334ee467bcd657e (diff) |
SSL_CERT_FILE -> NIX_SSL_CERT_FILE
This prevents collisions with the "native" OpenSSL, in particular on
OS X.
Fixes #921.
Diffstat (limited to 'src')
-rw-r--r-- | src/libstore/download.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index b228cd0b4..337ebc9bf 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -210,7 +210,8 @@ struct CurlDownloader : public Downloader curl_easy_setopt(req, CURLOPT_NOBODY, 1); if (request.verifyTLS) - curl_easy_setopt(req, CURLOPT_CAINFO, getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt").c_str()); + curl_easy_setopt(req, CURLOPT_CAINFO, + getEnv("NIX_SSL_CERT_FILE", getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt")).c_str()); else { curl_easy_setopt(req, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(req, CURLOPT_SSL_VERIFYHOST, 0); |