public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git, openssl, curl: Respect $NIX_SSL_CERT_FILE

Browse Source 
Slightly modified version of 942dbf89c6
This commit is contained in:
Domen Kožar
2017-03-20 14:11:20 +01:00
parent 72dc9c7f80
commit c3c9412c7d
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/curl/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";
};
patches = [ ];
patches = [ ./nix-ssl-cert-file.patch ];
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
pkgs/tools/networking/curl/nix-ssl-cert-file.patch
+14
View File
@@ -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) {