cps

flake.nix

@@ -18,19 +18,13 @@
 
       overlays = [
         haskellNix.overlay
-        (final: prev: {
-          inherit (sydpkgs.packages.${final.stdenv.hostPlatform.system})
-            bdwgc;
-        })
         (final: prev: {
           gyehoek = final.haskell-nix.project' {
             src = ./.;
             compiler-nix-name = "ghc912";
             shell = {
               withHoogle = true;
-              inputsFrom = [
-                self.packages.${final.stdenv.hostPlatform.system}.runtime
-              ];
+              inputsFrom = [];
               tools = {
                 cabal = {};
                 haskell-language-server = {};
@@ -39,13 +33,13 @@
                 gcc
                 qbe
                 haskellPackages.cabal-fmt
-                bdwgc
-                pkg-config
-                guile
-                clang-tools # clangd
-                gdb
-                gdbgui
-                rust-analyzer
+                self.packages.${final.stdenv.hostPlatform.system}.shake
+                final.wabt
+                final.nodejs
+                final.wasmtime
+                final.wasm-tools
+                final.wac-cli
+                final.guile
               ];
             };
           };
@@ -76,8 +70,7 @@
       packages = each-system ({ pkgs, system, ... }:
         hf.packages.${system} // {
           default = hf.packages.${system}."gyehoek:exe:gyehoek";
-          runtime = pkgs.callPackage ./runtime {};
-          inherit (pkgs) bdwgc;
+          shake = pkgs.callPackage ./shake-wrapper.nix {};
         });
 
       devShells = each-system