movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

wasmtime: move to by-name, cleanup (#399424)

Browse source
This commit is contained in:
Gaétan Lepage 2025-04-17 11:41:04 +02:00 • committed by GitHub
commit 20d252b74f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/interpreters/wasmtime/default.nix → pkgs/by-name/wa/wasmtime/package.nix
View file

@ -1,14 +1,12 @@
{ {
lib, lib,
rustPlatform,
cmake,
fetchFromGitHub,
Security,
stdenv, stdenv,
rustPlatform,
fetchFromGitHub,
cmake,
versionCheckHook,
nix-update-script,
}: }:
let
inherit (stdenv.targetPlatform.rust) cargoShortTarget;
in
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "wasmtime"; pname = "wasmtime";
version = "31.0.0"; version = "31.0.0";
@ -37,7 +35,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
"dev" "dev"
]; ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
doCheck = doCheck =
@ -52,6 +49,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
!isAarch64; !isAarch64;
postInstall = postInstall =
let
inherit (stdenv.targetPlatform.rust) cargoShortTarget;
in
'' ''
# move libs from out to dev # move libs from out to dev
install -d -m 0755 $dev/lib install -d -m 0755 $dev/lib
@ -74,6 +74,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
$dev/lib/libwasmtime.dylib $dev/lib/libwasmtime.dylib
''; '';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = { meta = {
description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
homepage = "https://wasmtime.dev/"; homepage = "https://wasmtime.dev/";

4
pkgs/top-level/all-packages.nix
View file

@ -19450,10 +19450,6 @@ with pkgs;
nanoizeNewlib = true; nanoizeNewlib = true;
}; };
wasmtime = callPackage ../development/interpreters/wasmtime {
inherit (darwin.apple_sdk.frameworks) Security;
};
wfuzz = with python3Packages; toPythonApplication wfuzz; wfuzz = with python3Packages; toPythonApplication wfuzz;
kodelife = callPackage ../applications/graphics/kodelife { kodelife = callPackage ../applications/graphics/kodelife {