bunch of stuff idek

1 files changed, 9 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index 81b9289..1ce6341 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,15 +18,16 @@
     ...
   }: let
     system = "x86_64-linux";
-    pkgs = import nixpkgs {
-      inherit system;
-      overlays = [(import rust-overlay)];
-    };
+    pkgs = nixpkgs.legacyPackages.${system};
+    pkgsWithRustOverlay = pkgs.extend (import rust-overlay);
   in {
     packages.${system} = {
-      bootler = pkgs.callPackage ./nix/pkgs/bootler.nix {};
-      bootle = pkgs.callPackage ./nix/pkgs/bootle.nix {
-        naersk = naersk;
+      bootler = pkgs.callPackage ./bootler/package.nix {};
+      bootle = pkgsWithRustOverlay.callPackage ./bootle/package.nix {
+        inherit naersk;
+        bootler = self.packages.${system}.bootler;
+      };
+      twasm = pkgs.callPackage ./twasm/package.nix {
         bootler = self.packages.${system}.bootler;
       };
     };
@@ -34,6 +35,7 @@
       inputsFrom = [
         self.packages.${system}.bootle
         self.packages.${system}.bootler
+        self.packages.${system}.twasm
       ];
     };
   };