diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:54 +0200 |
| commit | 811b876fab58ba8795727b35897f9d35f7aa9407 (patch) | |
| tree | e40ae48a763f6d2856e6be7f355960f8ab7eb147 /pkgs/tools/networking/curl | |
| parent | 24de66ce48c2cc7368760badd3ea3fccf7e734a5 (diff) | |
| download | nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.gz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.bz2 nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.lz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.xz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.zst nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.zip | |
Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6120cb5b52fb2ab456855d1fbf2994e. Sorry, this was supposed to go to staging instead of master...
Diffstat (limited to 'pkgs/tools/networking/curl')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/nix-ssl-cert-file.patch | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d1936cb11ad3..958bea34e7d3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; }; - patches = [ ./nix-ssl-cert-file.patch ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch deleted file mode 100644 index 20c408bfae23..000000000000 --- a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' curl-7.50.3-orig/src/tool_operate.c curl-7.50.3/src/tool_operate.c ---- curl-7.50.3-orig/src/tool_operate.c 2016-09-06 23:25:06.000000000 +0200 -+++ curl-7.50.3/src/tool_operate.c 2016-10-14 11:51:48.999943142 +0200 -@@ -269,7 +269,9 @@ - capath_from_env = true; - } - else { -- env = curlx_getenv("SSL_CERT_FILE"); -+ env = curlx_getenv("NIX_SSL_CERT_FILE"); -+ if(!env) -+ env = curlx_getenv("SSL_CERT_FILE"); - if(env) { - config->cacert = strdup(env); - if(!config->cacert) { |