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/development/compilers/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/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fb3001bbf17b..386ffa622944 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] + buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; @@ -48,8 +48,6 @@ rustPlatform.buildRustPackage rec { ''; checkPhase = '' - # Export SSL_CERT_FILE as without it one test fails with SSL verification error - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt # Disable cross compilation tests export CFG_DISABLE_CROSS_TESTS=1 cargo test |