nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 06:22:42 +01:00
Code Activity

SSL_CERT_FILE -> NIX_SSL_CERT_FILE

Browse source 
This prevents collisions with the "native" OpenSSL, in particular on
OS X.

Fixes #921.

(cherry picked from commit fb2dd32100)
This commit is contained in:
Eelco Dolstra 2016-10-13 17:09:10 +02:00
parent 8ca944e009
commit 41230dd463
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/download.cc
View file

@ -129,7 +129,8 @@ struct Curl
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
if (options.verifyTLS)
curl_easy_setopt(curl, CURLOPT_CAINFO, getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt").c_str());
curl_easy_setopt(curl, CURLOPT_CAINFO,
getEnv("NIX_SSL_CERT_FILE", getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt")).c_str());
else {
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);