From 1284c9d4baa16d13b10f4b193a9f3a040f1af198 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Mon, 9 Feb 2026 00:06:51 -0600
Subject: [PATCH] feat(nix): enhance overlays

---
 flake.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0aaeed310..d892dbd2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,11 @@
 
     forAllPlatforms = f: lib.genAttrs platforms (s: f legacyPackages.${s});
     forBuildablePlatforms = f: lib.genAttrs buildablePlatforms (s: f legacyPackages.${s});
+
+    mkPkgArgs = optimize: {
+      inherit optimize;
+      revision = self.shortRev or self.dirtyShortRev or "dirty";
+    };
   in {
     devShells = forAllPlatforms (pkgs: {
       default = pkgs.callPackage ./nix/devShell.nix {
@@ -85,15 +90,10 @@
         # Deps are needed for environmental setup on macOS
         deps = pkgs.callPackage ./build.zig.zon.nix {};
       })
-      // forBuildablePlatforms (pkgs: let
-        mkArgs = optimize: {
-          inherit optimize;
-          revision = self.shortRev or self.dirtyShortRev or "dirty";
-        };
-      in rec {
-        ghostty-debug = pkgs.callPackage ./nix/package.nix (mkArgs "Debug");
-        ghostty-releasesafe = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
-        ghostty-releasefast = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
+      // forBuildablePlatforms (pkgs: rec {
+        ghostty-debug = pkgs.callPackage ./nix/package.nix (mkPkgArgs "Debug");
+        ghostty-releasesafe = pkgs.callPackage ./nix/package.nix (mkPkgArgs "ReleaseSafe");
+        ghostty-releasefast = pkgs.callPackage ./nix/package.nix (mkPkgArgs "ReleaseFast");
 
         ghostty = ghostty-releasefast;
         default = ghostty;
@@ -137,10 +137,10 @@
     overlays = {
       default = self.overlays.releasefast;
       releasefast = final: prev: {
-        ghostty = self.packages.${prev.stdenv.hostPlatform.system}.ghostty-releasefast;
+        ghostty = final.callPackage ./nix/package.nix (mkPkgArgs "ReleaseFast");
       };
       debug = final: prev: {
-        ghostty = self.packages.${prev.stdenv.hostPlatform.system}.ghostty-debug;
+        ghostty = final.callPackage ./nix/package.nix (mkPkgArgs "Debug");
       };
     };
   };