From 989723ecf240a4f5a1b8dd3d61fe8a2d48cfda7a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 18 Nov 2023 12:19:27 +0100 Subject: rustc-wasm32: merge into rustc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since wasm32-unknown-unknown doesn't require any extra platform-specific dependencies (e.g. libc), we might as well just always include in with rustc. We could also include other targets fitting these criteria, but I wasn't able to find any others that actually build (not even wasm64-unknown-unknown). The old rustc-wasm32 package disabled documentation, but we don't actually need to do that — we just need to allow for some broken links in the wasm32-unknown-unknown documentation. Broken links in documentation are an upstream issue anyway. There's no need we need to fail our build for them. --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/blockchains/polkadot') diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index e1b042aadbb6..42662d0ededf 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -4,7 +4,7 @@ , rocksdb , rust-jemalloc-sys-unprefixed , rustPlatform -, rustc-wasm32 +, rustc , stdenv , Security , SystemConfiguration @@ -61,8 +61,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook - rustc-wasm32 - rustc-wasm32.llvmPackages.lld + rustc + rustc.llvmPackages.lld ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled -- cgit 1.4.1