Skip to content

Commit

Permalink
chore: remove obsolete libwasmvm
Browse files Browse the repository at this point in the history
  • Loading branch information
hussein-aitlahcen committed Dec 9, 2024
1 parent 2b7a9d5 commit 8cda228
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
21 changes: 0 additions & 21 deletions networks/simulation/simd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@ _: {
let
libwasmvm = self'.packages.libwasmvm-2_1_2;
in
# libwasmvm = pkgs.stdenv.mkDerivation {
# name = "libwasmvm";
# src = pkgs.fetchurl {
# url = "https://github.com/CosmWasm/wasmvm/releases/download/v2.2.0-rc.2/libwasmvm_muslc.x86_64.a";
# hash = "sha256-LEl7UkbHIXpwxEfFARfH+wmQnsI+bkFRpN4+XynbgTQ=";
# };
# dontUnpack = true;
# buildPhase = ''
# mkdir -p $out/lib/
# cp $src $out/lib/libwasmvm.x86_64.a
# '';
# };
if pkgs.stdenv.isLinux then
{
# Statically link if we're on linux
Expand All @@ -54,15 +42,6 @@ _: {
"-extldflags '-z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm}/lib'"
];
}
# else if pkgs.stdenv.isDarwin then {
# # Dynamically link if we're on darwin by wrapping the program
# # such that the DYLD_LIBRARY_PATH includes libwasmvm
# buildInputs = [ pkgs.makeWrapper libwasmvm ];
# postFixup = ''
# wrapProgram $out/bin/wasmd \
# --set DYLD_LIBRARY_PATH ${(pkgs.lib.makeLibraryPath [ libwasmvm ])};
# '';
# } else
else
{ }
)
Expand Down
3 changes: 0 additions & 3 deletions tools/libwasmvm/libwasmvm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@
in
{
packages.libwasmvm = mkLibwasmvm_v1 inputs.wasmvm;
packages.libwasmvm-1_5_0 = mkLibwasmvm_v1 inputs.wasmvm-1_5_0;
packages.libwasmvm-2_0_0 = mkLibwasmvm_v1 inputs.wasmvm-2_0_0;
packages.libwasmvm-2_1_2 = mkLibwasmvm_v2 inputs.wasmvm-2_1_2;
packages.libwasmvm-2_1_3 = mkLibwasmvm_v2 inputs.wasmvm-2_1_3;
packages.libwasmvm-2_2_0 = mkLibwasmvm_v2 inputs.wasmvm-2_2_0;
};
}

0 comments on commit 8cda228

Please sign in to comment.