diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:54 +0200 |
| commit | 811b876fab58ba8795727b35897f9d35f7aa9407 (patch) | |
| tree | e40ae48a763f6d2856e6be7f355960f8ab7eb147 /pkgs/applications/version-management | |
| parent | 24de66ce48c2cc7368760badd3ea3fccf7e734a5 (diff) | |
| download | nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.gz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.bz2 nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.lz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.xz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.zst nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.zip | |
Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6120cb5b52fb2ab456855d1fbf2994e. Sorry, this was supposed to go to staging instead of master...
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, 2 insertions, 5 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 0e0697dfb211..bafd65e8c93e 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,14 +1,11 @@ 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,10 @@ +@@ -544,6 +544,7 @@ #if LIBCURL_VERSION_NUM >= 0x070908 set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); #endif -+ 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, "SSL_CERT_FILE"); set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); |