From eef34ea7e5e2070edbc2e3bf6fe40a1f7351f3a7 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Mon, 28 Feb 2022 17:18:55 -0500
Subject: [PATCH] We need a reference to the kitchen package

---
 flake.nix              | 4 +++-
 nix/kitchen/module.nix | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index ced400d..b1b1abb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
             trunkGen = (import ./nix/trunk/default.nix);
             kitchenWasmGen = (import ./nix/kitchenWasm/default.nix);
             cargoVendorGen = (import ./nix/cargoVendorDeps/default.nix);
+            moduleGen = (import ./nix/kitchen/module.nix);
             version = "0.2.1";
         in
         flake-utils.lib.eachDefaultSystem (system:
@@ -33,6 +34,7 @@
                     # Because it's a workspace we need the other crates available as source
                     root = (pkgs.callPackage gitignore { }).gitignoreSource ./.;
                 });
+                module = moduleGen {inherit kitchen;};
             in
             {
                 packages = {
@@ -43,7 +45,7 @@
                             ;
                 };
                 defaultPackage = kitchen;
-                nixosModules.kitchen = import ./nix/kitchen/module.nix;
+                nixosModules.kitchen = module;
             } 
         );
 }
\ No newline at end of file
diff --git a/nix/kitchen/module.nix b/nix/kitchen/module.nix
index 4a99114..a9425fa 100644
--- a/nix/kitchen/module.nix
+++ b/nix/kitchen/module.nix
@@ -1,3 +1,4 @@
+{kitchen}:
 {config, lib, pkgs, ...}:
 with lib;
 {
@@ -14,7 +15,6 @@ with lib;
     config = mkIf config.services.kitchen.enable {
         nixpkgs.overlays = [
             (final: prev: {
-                kitchen = (import ../packages/kitchen/package.nix) { inherit pkgs; };
                 recipes = (import ../packages/recipes/package.nix) { inherit pkgs; };
             })
         ];
@@ -25,7 +25,7 @@ with lib;
             serviceConfig = {
                 restart = "on-failure";
                 restartSec = "10s";
-                ExecStart = "${self.packages."${system}".kitchen}/bin/kitchen serve --listen ${config.services.kitchen.listenSocket} --dir ${pkgs.recipes}";
+                ExecStart = "${kitchen}/bin/kitchen serve --listen ${config.services.kitchen.listenSocket} --dir ${pkgs.recipes}";
             };
         };
     };