From e831648b183329b1e944bf8c2c8ff734c0ec5833 Mon Sep 17 00:00:00 2001
From: Ed L <el-github@elangley.org>
Date: Thu, 2 Apr 2026 15:47:22 -0700
Subject: [PATCH 1/2] feat(build): don't bother with static build

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

diff --git a/flake.nix b/flake.nix
index 6bd2392..c94f495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,28 +22,25 @@
       pkgs = import nixpkgs {inherit system overlays;};
       isLinux = pkgs.lib.hasInfix "linux" system;
 
-      rustToolchain = pkgs.rust-bin.stable.latest.default.override {
-        extensions = ["rust-src" "clippy" "rustfmt"];
-        targets = pkgs.lib.optionals isLinux ["x86_64-unknown-linux-musl"];
-      };
-
       buildPkgs =
         if isLinux
         then pkgs.pkgsMusl
         else pkgs;
 
+      rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+        extensions = ["rust-src" "clippy" "rustfmt"];
+        targets = pkgs.lib.optionals isLinux ["x86_64-unknown-linux-musl"];
+      };
+
       generatedCargoNix = crate2nix.tools.${system}.generatedCargoNix {
         name = "improvise";
         src = ./.;
       };
 
+      musliTarget = "x86_64-unknown-linux-musl";
+
       cargoNix = import generatedCargoNix {
-        inherit pkgs;
-        buildRustCrateForPkgs = pkgs:
-          buildPkgs.buildRustCrate.override {
-            rustc = rustToolchain;
-            cargo = rustToolchain;
-          };
+        pkgs = pkgs;
       };
     in {
       devShells.default = pkgs.mkShell ({

From 77b33b7a852e1d6652ee685624f5b9143f521ed9 Mon Sep 17 00:00:00 2001
From: Ed L <el-github@elangley.org>
Date: Thu, 2 Apr 2026 15:58:28 -0700
Subject: [PATCH 2/2] refactor: further cleanup of linux build

---
 flake.nix | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index c94f495..9f1a4b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,26 +43,15 @@
         pkgs = pkgs;
       };
     in {
-      devShells.default = pkgs.mkShell ({
-          nativeBuildInputs =
-            [
-              rustToolchain
-              pkgs.pkg-config
-              pkgs.rust-analyzer
-              crate2nix.packages.${system}.default
-            ]
-            ++ pkgs.lib.optionals isLinux [
-              pkgs.gcc
-              pkgs.pkgsMusl.stdenv.cc
-            ];
-
-          RUST_BACKTRACE = "1";
-        }
-        // pkgs.lib.optionalAttrs isLinux {
-          CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "${pkgs.gcc}/bin/gcc";
-          CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER = "${pkgs.pkgsMusl.stdenv.cc}/bin/cc";
-          CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
-        });
+      devShells.default = pkgs.mkShell {
+        nativeBuildInputs = [
+          rustToolchain
+          pkgs.pkg-config
+          pkgs.rust-analyzer
+          crate2nix.packages.${system}.default
+        ];
+        RUST_BACKTRACE = "1";
+      };
 
       packages.default = cargoNix.rootCrate.build;
     });