diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-03-22 13:40:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 13:40:57 +0100 |
| commit | f0875982d17a7478d3ea0051e6a0be1bc98ff364 (patch) | |
| tree | 828dada88ee0fc9147fbdb297dd9de09d335612a /pkgs/applications/version-management | |
| parent | 8143413e590cf249b50047906d61eab2ce983c12 (diff) | |
| parent | c86f05e7ce13e64238960ebf3ee9706142db961b (diff) | |
| download | nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar.gz nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar.bz2 nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar.lz nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar.xz nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.tar.zst nixlib-f0875982d17a7478d3ea0051e6a0be1bc98ff364.zip | |
Merge pull request #24203 from layus/nix-ssl-cert-file
git, curl, openssl: Refactor $NIX_SSL_CERT_FILE handling
Diffstat (limited to 'pkgs/applications/version-management')
| -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 | 14 |
2 files changed, 0 insertions, 15 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 af5fc8a8be46..d6cc205bbae4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -30,7 +30,6 @@ 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 deleted file mode 100644 index 0e0697dfb211..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 @@ - #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, "GIT_SSL_CAINFO"); - - set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); |