Merge pull request #33010 from LnL7/cacert-hook

cacert: add hook that sets SSL_CERT_FILE
This commit is contained in:
Daiderd Jordan
2018-01-07 09:55:15 +01:00
committed by GitHub
13 changed files with 19 additions and 28 deletions
+1 -2
View File
@@ -32,7 +32,7 @@ in stdenv.mkDerivation (args // {
patchRegistryDeps = ./patch-registry-deps;
buildInputs = [ git rust.cargo rust.rustc ] ++ buildInputs;
buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs;
configurePhase = args.configurePhase or ''
runHook preConfigure
@@ -60,7 +60,6 @@ in stdenv.mkDerivation (args // {
unset cargoDepsCopy
export RUST_LOG=${logLevel}
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
'' + (args.postUnpack or "");
buildPhase = with builtins; args.buildPhase or ''
-1
View File
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
exit 1
fi
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
cargo vendor