diff --git a/flake.nix b/flake.nix
index ad7d4da17..347cd1de8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,23 +52,19 @@
         wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {};
       };
 
-      packages.${system} = rec {
-        ghostty-debug = pkgs-stable.callPackage ./nix/package.nix {
+      packages.${system} = let
+        mkArgs = optimize: {
           inherit (pkgs-zig-0-12) zig_0_12;
+          inherit optimize;
+
           revision = self.shortRev or self.dirtyShortRev or "dirty";
-          optimize = "Debug";
         };
-        ghostty-releasesafe = pkgs-stable.callPackage ./nix/package.nix {
-          inherit (pkgs-zig-0-12) zig_0_12;
-          revision = self.shortRev or self.dirtyShortRev or "dirty";
-          optimize = "ReleaseSafe";
-        };
-        ghostty-releasefast = pkgs-stable.callPackage ./nix/package.nix {
-          inherit (pkgs-zig-0-12) zig_0_12;
-          revision = self.shortRev or self.dirtyShortRev or "dirty";
-          optimize = "ReleaseFast";
-        };
-        ghostty = ghostty-releasesafe;
+      in rec {
+        ghostty-debug = pkgs-stable.callPackage ./nix/package.nix (mkArgs "Debug");
+        ghostty-releasesafe = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
+        ghostty-releasefast = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
+
+        ghostty = ghostty-releasefast;
         default = ghostty;
       };
 
diff --git a/nix/devShell.nix b/nix/devShell.nix
index c5bd045d5..e36a2f873 100644
--- a/nix/devShell.nix
+++ b/nix/devShell.nix
@@ -78,7 +78,7 @@ in
   mkShell {
     name = "ghostty";
 
-    nativeBuildInputs =
+    packages =
       [
         # For builds
         llvmPackages_latest.llvm
@@ -120,13 +120,7 @@ in
         gdb
         valgrind
         wraptest
-      ];
 
-    buildInputs =
-      [
-        # TODO: non-linux
-      ]
-      ++ lib.optionals stdenv.isLinux [
         bzip2
         expat
         fontconfig