pyrox.dev
Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
+6
pkgs/tools/networking/curl/7.15.nix
+6
pkgs/tools/networking/curl/7.15.nix
···
32
32
preConfigure = ''
33
33
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
34
34
'';
35
+
36
+
# make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
37
+
postConfigure = ''
38
+
echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
39
+
'';
40
+
35
41
configureFlags = [
36
42
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
37
43
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
+5
pkgs/tools/networking/curl/default.nix
+5
pkgs/tools/networking/curl/default.nix
···
35
35
rm src/tool_hugehelp.c
36
36
'';
37
37
38
+
# make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
39
+
postConfigure = ''
40
+
echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
41
+
'';
42
+
38
43
configureFlags = [
39
44
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
40
45
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )