Fix rust-wasm-cross

cachix · Apr 15, 2024 · eaeac1b · eaeac1b
1 parent ecb9b22
commit eaeac1b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/examples/rust-wasm-cross/.test.js b/examples/rust-wasm-cross/.test.js
@@ -0,0 +1 @@
+import("./app/pkg/app.js").then((app) => app.main());
diff --git a/examples/rust-wasm-cross/.test.sh b/examples/rust-wasm-cross/.test.sh
@@ -12,7 +12,6 @@ fi
 [[ "$CARGO_INSTALL_ROOT" == "$DEVENV_STATE/cargo-install" ]]
 echo "$PATH" | grep -- "$CARGO_INSTALL_ROOT/bin"
 
-cd app
-wasm-pack build --target nodejs
+wasm-pack build ./app --target nodejs
 
-node <<< "import('./pkg/app.js').then(app => app.main());"
+node .test.js
diff --git a/examples/rust-wasm-cross/app/Cargo.toml b/examples/rust-wasm-cross/app/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2021"
 [dependencies]
 wasm-bindgen = "0.2.84"
 
-[workspace]
-
 [profile.release]
 # Tell `rustc` to optimize for small code size.
 opt-level = "s"
+
+[workspace]
diff --git a/examples/rust-wasm-cross/devenv.nix b/examples/rust-wasm-cross/devenv.nix
@@ -8,16 +8,18 @@
 
     targets = [ "wasm32-unknown-unknown" ];
 
-    components = [ "rustc" "cargo" "clippy" "rustfmt" "rust-analyzer" ];
+    components = [ "rustc" "cargo" "clippy" "rustfmt" "rust-analyzer" "rust-std" ];
   };
 
-  pre-commit.hooks = {
-    rustfmt.enable = true;
-    clippy.enable = true;
-  };
+  # These break us
+  # pre-commit.hooks = {
+  #  rustfmt.enable = true;
+  #  clippy.enable = true;
+  # };
 
   packages = [
     pkgs.wasm-pack
+    pkgs.nodejs
   ] ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk; [
     frameworks.Security
   ]);

diff --git a/examples/rust-wasm-cross/devenv.yaml b/examples/rust-wasm-cross/devenv.yaml
@@ -4,3 +4,5 @@ inputs:
     inputs:
       nixpkgs:
         follows: nixpkgs
+  devenv:
+    url: path:../../src/modules