diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-07 09:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 09:55:15 +0100 |
| commit | 5a02143c206e8658e6e79047a6db206ace36f22d (patch) | |
| tree | 0de386befe2c1a6337d0808218436f3521ea1188 /pkgs/build-support/rust | |
| parent | 84f973601404331e8670ecdc6fc22aa8c6b5b2d2 (diff) | |
| parent | 091c2b9f04189301f18ff0bc8336541d137f1d61 (diff) | |
| download | nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.gz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.bz2 nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.lz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.xz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.zst nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.zip | |
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/rust/fetchcargo.nix | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 57948c33bbc3..d720532e1479 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -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 '' diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 9b3ba5303398..8c136d864883 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -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 |