diff options
| author | Domen Kožar <domen@dev.si> | 2017-03-20 14:11:20 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-03-20 14:11:20 +0100 |
| commit | c3c9412c7d6513091295f4e253d416ddbd17fe55 (patch) | |
| tree | 05152302821472c86342ddd974ddfcd4793ffaa0 /pkgs/tools/networking/curl | |
| parent | 72dc9c7f80101a6b5d02bbdde707c814f323fa96 (diff) | |
| download | nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.gz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.bz2 nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.lz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.xz nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.tar.zst nixlib-c3c9412c7d6513091295f4e253d416ddbd17fe55.zip | |
git, openssl, curl: Respect $NIX_SSL_CERT_FILE
Slightly modified version of 942dbf89c6120cb5b52fb2ab456855d1fbf2994e
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, 15 insertions, 1 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bb9316512ecd..f8d1506cca34 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw"; }; - patches = [ ]; + patches = [ ./nix-ssl-cert-file.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch new file mode 100644 index 000000000000..20c408bfae23 --- /dev/null +++ b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +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) { |