From cca07f139dc2b01fee4f241d43b450a8df4b2e89 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 May 2024 00:12:37 +0200 Subject: [PATCH 1/2] wasmtime: fix build on aarch64-darwin The check phase fails on aarch64-darwin because of: ``` $ nix-build -A wasmtime ... buildPhase completed in 1 minutes 41 seconds Running phase: checkPhase Executing cargoCheckHook ++ cargo test -j 10 --profile release --target aarch64-apple-darwin --frozen -- --test-threads=10 ... > error: linker `rust-lld` not found > | > = note: No such file or directory (os error 2) > > error: could not compile `wasi-preview1-component-adapter` (lib) due to 1 previous error ``` I tried to bring `lld` into scope and set `RUSTFLAGS = "-C linker=lld` but I couldn't get the tests to build. So I just disabled them on aarch64-darwin. --- .../interpreters/wasmtime/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index afa65741892c..06bff777ddbf 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, Security, lib, stdenv }: +{ rustPlatform, rustfmt, fetchFromGitHub, Security, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -21,11 +21,20 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - # SIMD tests are only executed on platforms that support all - # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): - # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 - doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support); - cargoTestFlags = ["--package" "wasmtime-runtime"]; + # rustfmt is brought into scope to fix the following + # warning: cranelift-codegen@0.108.0: + # Failed to run `rustfmt` on ISLE-generated code: Os + # { code: 2, kind: NotFound, message: "No such file or directory" } + nativeBuildInputs = [ rustfmt ]; + + doCheck = with stdenv.buildPlatform; + # SIMD tests are only executed on platforms that support all + # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): + # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 + (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) && + # The dependency `wasi-preview1-component-adapter` fails to build because of: + # error: linker `rust-lld` not found + !(isAarch64 && stdenv.isDarwin); postInstall = '' # move libs from out to dev From cbb848547a29a483935ee3baff3813a988698756 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 May 2024 00:28:13 +0200 Subject: [PATCH 2/2] wasmtime: disable checks on all aarch64 platforms --- pkgs/development/interpreters/wasmtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 06bff777ddbf..f880cf81a721 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) && # The dependency `wasi-preview1-component-adapter` fails to build because of: # error: linker `rust-lld` not found - !(isAarch64 && stdenv.isDarwin); + !isAarch64; postInstall = '' # move libs from out to dev