diff options
| author | Domen Kožar <domen@dev.si> | 2017-03-20 14:11:20 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-03-20 14:11:20 +0100 |
| commit | c3c9412c7d6513091295f4e253d416ddbd17fe55 (patch) | |
| tree | 05152302821472c86342ddd974ddfcd4793ffaa0 /pkgs/applications/version-management | |
| parent | 72dc9c7f80101a6b5d02bbdde707c814f323fa96 (diff) | |
| download | nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.gz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.bz2 nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.lz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.xz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.zst nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.zip | |
git, openssl, curl: Respect $NIX_SSL_CERT_FILE
Slightly modified version of 942dbf89c6120cb5b52fb2ab456855d1fbf2994e
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"); |