From d4996d6f31a8fb0b37d6500b627fc4f1a7cca622 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Wed, 11 Jan 2023 09:08:46 +0000
Subject: [PATCH] flake: fix passthru overlays (fixes broken image building)

---
 flake.nix         | 9 ++++++---
 modules/image.nix | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1b7d9531..44bc6016 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,13 +103,16 @@
       overlays = rec {
         default = pkgs;
         pkgs = import ./pkgs/overlay.nix;
-        passthru = next: prev:
+        passthru =
           let
-            stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
+            stable = next: prev: {
+              stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
+            };
             mobile = (import "${mobile-nixos}/overlay/overlay.nix");
             uninsane = uninsane-dot-org.overlay;
           in
-            uninsane next (mobile next (stable next prev));
+          next: prev:
+            (stable next prev) // (mobile next prev) // (uninsane next prev);
       };
 
       nixosModules = rec {
diff --git a/modules/image.nix b/modules/image.nix
index c772e562..3286d91a 100644
--- a/modules/image.nix
+++ b/modules/image.nix
@@ -82,7 +82,7 @@ in
   in
   lib.mkIf cfg.enable
   {
-    system.build.img-without-firmware = with pkgs; imageBuilder.diskImage.makeGPT {
+    system.build.img-without-firmware = with pkgs; pkgs.imageBuilder.diskImage.makeGPT {
       name = "nixos";
       diskID = vfatUuidFromFs bootFs;
       # leave some space for firmware