From 263abda17b29839dcd7ef5ef18112f766c92c4be Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Mon, 23 Sep 2024 20:05:43 -0400
Subject: [PATCH] fix: various nix build issues

---
 flake.nix                   | 11 +++++++++--
 nix/kitchenWasm/default.nix |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3d93b23..7f1a067 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,8 +69,15 @@
                     root = ./.;
                 });
                 kitchenWasmDebug = kitchenWasmGen {
-                    inherit pkgs rust-wasm wasm-bindgen version;
-                    features = "--features debug_logs";
+                    inherit pkgs rust-wasm wasm-bindgen version cargo-wasm2map;
+                    lockFile = ./Cargo.lock;
+                    outputHashes = {
+                        # I'm maintaining some patches for these so the lockfile hashes are a little
+                        # incorrect. We override those here.
+                        "wasm-web-component-0.2.0" = "sha256-quuPgzGb2F96blHmD3BAUjsWQYbSyJGZl27PVrwL92k=";
+                        "sycamore-0.8.2" = "sha256-D968+8C5EelGGmot9/LkAlULZOf/Cr+1WYXRCMwb1nQ=";
+                    };
+                    #features = "--features debug_logs";
                 };
                 kitchenDebug = (kitchenGen {
                     inherit pkgs version naersk-lib rust-wasm;
diff --git a/nix/kitchenWasm/default.nix b/nix/kitchenWasm/default.nix
index 4a3b669..17828b3 100644
--- a/nix/kitchenWasm/default.nix
+++ b/nix/kitchenWasm/default.nix
@@ -34,9 +34,7 @@ stdenv.mkDerivation {
         cp -r static $out
 		export project=kitchen
 		sh ../scripts/wasm-build.sh release
-		sh ../scripts/wasm-opt.sh release
 		sh ../scripts/wasm-sourcemap.sh
-        rm -f $out/kitchen_wasm_bg.wasm
         cp -r index.html $out
         cp -r favicon.ico $out
         rm -rf $out/release