diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-04-12 11:43:43 +0200 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-04-12 11:47:56 +0200 |
| commit | 9eced61d2adbb61ee8e0f446775728d032078dcb (patch) | |
| tree | f6d1fda2baf0ff83ea5f7fbc31e641795974c7c9 /pkgs/applications | |
| parent | dddb62d3e31bed1d6127f396f5f89c6ed2799c9e (diff) | |
| download | nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar.gz nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar.bz2 nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar.lz nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar.xz nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.tar.zst nixlib-9eced61d2adbb61ee8e0f446775728d032078dcb.zip | |
git: respect $SSL_CERT_FILE
This allows git to work on systems without /etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing with "error setting certificate verify locations".
Diffstat (limited to 'pkgs/applications')
| -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"); |