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

Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging

Browse Source 
Standardize NixOS on using only SSL_CERT_FILE for the trusted SSL certificate store.
This commit is contained in:
Wout Mertens 2014-11-27 13:29:50 +01:00
commit cacf3f6c1e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/curl/7.15.nix
View File

@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
''; '';
# make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
postConfigure = ''
echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
'';
configureFlags = [ configureFlags = [
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )

5
pkgs/tools/networking/curl/default.nix
View File

@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
rm src/tool_hugehelp.c rm src/tool_hugehelp.c
''; '';
# make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
postConfigure = ''
echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
'';
configureFlags = [ configureFlags = [
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )