From 03be69dec898b11cd12128f6eb94c91be65bd1f9 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 11 Mar 2023 00:27:54 +0000
Subject: [PATCH] feat(nix): refactor out common args

---
 flake.nix | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7b83066..f4f97c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,29 +53,31 @@
       rustStable =
         pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
       craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
-      src = ./.;
-      buildInputs = with pkgs;
-        [xorg.libxcb python39]
-        ++ pkgs.lib.optionals stdenv.isDarwin
-        [pkgs.darwin.apple_sdk.frameworks.AppKit];
-      cargoArtifacts = craneLib.buildDepsOnly {inherit src buildInputs;};
-
-      clipboard-substitutor = craneLib.buildPackage {
-        inherit src buildInputs;
-        doCheck = false;
-      };
-      clipboard-substitutor-clippy = craneLib.cargoClippy {
-        inherit cargoArtifacts src buildInputs;
+      commonArgs = {
+        src = craneLib.cleanCargoSource ./.;
+        buildInputs = with pkgs;
+          [xorg.libxcb python39]
+          ++ pkgs.lib.optionals stdenv.isDarwin
+          [pkgs.darwin.apple_sdk.frameworks.AppKit];
+        nativeBuildInputs = [];
         cargoClippyExtraArgs = "--all-targets -- --deny warnings";
       };
-      clipboard-substitutor-fmt = craneLib.cargoFmt {inherit src;};
-      clipboard-substitutor-audit =
-        craneLib.cargoAudit {inherit src advisory-db;};
-      clipboard-substitutor-nextest = craneLib.cargoNextest {
-        inherit cargoArtifacts src buildInputs;
-        partitions = 1;
-        partitionType = "count";
-      };
+      cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {doCheck = false;});
+
+      clipboard-substitutor = craneLib.buildPackage (commonArgs // {doCheck = false;});
+      clipboard-substitutor-clippy = craneLib.cargoClippy (commonArgs
+        // {
+          inherit cargoArtifacts;
+        });
+      clipboard-substitutor-fmt = craneLib.cargoFmt (commonArgs // {});
+      clipboard-substitutor-audit = craneLib.cargoAudit (commonArgs // {inherit advisory-db;});
+      clipboard-substitutor-nextest = craneLib.cargoNextest (commonArgs
+        // {
+          inherit cargoArtifacts;
+          src = ./.;
+          partitions = 1;
+          partitionType = "count";
+        });
     in {
       checks = {
         # TODO: migrate to cargo-audit