diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 12:04:28 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 12:06:10 +0200 |
commit | 942dbf89c6120cb5b52fb2ab456855d1fbf2994e (patch) | |
tree | 2abe1536e2d47fc0c8ace6da13dbea1de0f92ac8 /pkgs/applications/version-management | |
parent | 027efec8798547c0e8cff7861680f9b95732c12d (diff) | |
download | nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar.gz nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar.bz2 nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar.lz nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar.xz nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.tar.zst nixlib-942dbf89c6120cb5b52fb2ab456855d1fbf2994e.zip |
openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows Nix to set a CA path without interfering with other packages (such as Homebrew). See https://github.com/NixOS/nix/issues/921.
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch index bafd65e8c93e..0e0697dfb211 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -1,11 +1,14 @@ diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c --- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100 +++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200 -@@ -544,6 +544,7 @@ +@@ -544,6 +544,10 @@ #if LIBCURL_VERSION_NUM >= 0x070908 set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); #endif -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); ++ if (getenv("NIX_SSL_CERT_FILE")) ++ set_from_env(&ssl_cainfo, "NIX_SSL_CERT_FILE"); ++ else ++ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); |