diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2014-11-25 23:49:11 +0100 |
|---|---|---|
| committer | Wout Mertens <Wout.Mertens@gmail.com> | 2014-11-26 00:29:37 +0100 |
| commit | 272f2c365c0778836aeace102946f1040268c4a1 (patch) | |
| tree | f69b1c3bd9303e0d5b5e6ac2af9a079fd0df024f /pkgs/applications | |
| parent | 5c19521c6e3b79ae42ab928494490876a9c47a27 (diff) | |
| download | nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar.gz nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar.bz2 nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar.lz nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar.xz nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.tar.zst nixpkgs-272f2c365c0778836aeace102946f1040268c4a1.zip | |
git: Support $SSL_CERT_FILE
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch | 13 |
2 files changed, 20 insertions, 2 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 7ba69a9fc18..69e88f32c41 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,7 +24,12 @@ stdenv.mkDerivation { sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; }; - patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; + patches = [ + ./docbook2texi.patch + ./symlinks-in-bin.patch + ./cert-path.patch + ./ssl-cert-file.patch + ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x @@ -142,6 +147,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ]; }; } 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 00000000000..dd216b7bf6f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -0,0 +1,13 @@ +This patch adds support for the OpenSSL SSL_CERT_FILE environment variable. +GIT_SSL_CAINFO still takes precedence. + +--- git-orig/http.c.orig 2014-11-25 23:27:56.000000000 +0100 ++++ git-orig/http.c 2014-11-25 23:28:48.000000000 +0100 +@@ -433,6 +433,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"); |