diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-04-29 23:03:52 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-04-29 23:03:52 +0100 |
| commit | d2b176ace598042edd3789e8d8d942b080aaf6f7 (patch) | |
| tree | a488dcbd163b18bde0e5d7baf8071f5d770aec4d | |
| parent | aa8bc97dd666209c2f2d8f793d33806e28394fc6 (diff) | |
| parent | 9eced61d2adbb61ee8e0f446775728d032078dcb (diff) | |
| download | nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar.gz nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar.bz2 nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar.lz nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar.xz nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.tar.zst nixlib-d2b176ace598042edd3789e8d8d942b080aaf6f7.zip | |
Merge pull request #14617 from nathan7/git-ssl-cert-file
git: respect $SSL_CERT_FILE
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4f41ffb916ef..082a791a69c2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch + ./ssl-cert-file.patch ]; postPatch = '' 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 new file mode 100644 index 000000000000..bafd65e8c93e --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -0,0 +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,7 @@ + #if LIBCURL_VERSION_NUM >= 0x070908 + set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); + #endif ++ 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"); |