From c2a7bd7b11938553f4ec517248b34bd852ecc574 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 29 Aug 2025 22:55:19 +0200 Subject: [PATCH 1/3] wasmtime: don't propagate binaries for C API & library --- pkgs/by-name/wa/wasmtime/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 354449e0351da..c3fc4078f75a6 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -48,6 +48,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # error: linker `rust-lld` not found !isAarch64; + # prevent $out from being propagated to $dev: + # the library and header files are not dependent on the binaries + propagatedBuildOutputs = [ ]; + postInstall = let inherit (stdenv.targetPlatform.rust) cargoShortTarget; From 86b7fe152b6e492ac066d6026d25c1409ae54de6 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 29 Aug 2025 22:53:02 +0200 Subject: [PATCH 2/3] wasmtime: use `moveToOutput` in postInstall --- pkgs/by-name/wa/wasmtime/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index c3fc4078f75a6..fe2a62552e54e 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -57,10 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (stdenv.targetPlatform.rust) cargoShortTarget; in '' - # move libs from out to dev - install -d -m 0755 $dev/lib - install -m 0644 ''${!outputLib}/lib/* $dev/lib - rm -r ''${!outputLib}/lib + moveToOutput lib $dev # copy the build.rs generated c-api headers # https://github.com/rust-lang/cargo/issues/9661 From 6c867d22dee9c36a93a1874697da46702fc99059 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 29 Aug 2025 23:28:07 +0200 Subject: [PATCH 3/3] wasmtime: add nekowinston to maintainers --- pkgs/by-name/wa/wasmtime/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index fe2a62552e54e..66fb84bfcf829 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -90,6 +90,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ ereslibre matthewbauer + nekowinston ]; platforms = lib.platforms.unix; changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${finalAttrs.version}/RELEASES.md";