From 21a4b9e5a1ed3296431ed4e143a82d15ab704f76 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Wed, 1 May 2024 01:05:24 -0700
Subject: [PATCH] only set `GRAPEVINE_VERSION_EXTRA` for final build

This prevents us from needing to recompile the dependencies when that
environment variable changes, which generally changes on every commit,
which is far more frequently than the dependencies are actually changed.
---
 nix/pkgs/default/default.nix | 66 ++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/nix/pkgs/default/default.nix b/nix/pkgs/default/default.nix
index 298dd6cb..8cfeac8e 100644
--- a/nix/pkgs/default/default.nix
+++ b/nix/pkgs/default/default.nix
@@ -14,15 +14,13 @@
 }:
 
 let
-  env =
+  buildDepsOnlyEnv =
     let
       rocksdb' = rocksdb.override {
         enableJemalloc = builtins.elem "jemalloc" features;
       };
     in
     {
-      GRAPEVINE_VERSION_EXTRA =
-        inputs.self.shortRev or inputs.self.dirtyShortRev;
       CARGO_PROFILE = profile;
       ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
       ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
@@ -36,26 +34,43 @@ let
         rust
         stdenv;
     });
-in
 
-craneLib.buildPackage rec {
-  inherit
-    (craneLib.crateNameFromCargoToml {
-      cargoToml = "${inputs.self}/Cargo.toml";
-    })
-    pname
-    version;
+  buildPackageEnv = {
+    GRAPEVINE_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev;
+  } // buildDepsOnlyEnv;
 
-  src = let filter = inputs.nix-filter.lib; in filter {
-    root = inputs.self;
+  commonAttrs = {
+    inherit
+      (craneLib.crateNameFromCargoToml {
+        cargoToml = "${inputs.self}/Cargo.toml";
+      })
+      pname
+      version;
 
-    # Keep sorted
-    include = [
-      "Cargo.lock"
-      "Cargo.toml"
-      "src"
+    src = let filter = inputs.nix-filter.lib; in filter {
+      root = inputs.self;
+
+      # Keep sorted
+      include = [
+        "Cargo.lock"
+        "Cargo.toml"
+        "src"
+      ];
+    };
+
+    nativeBuildInputs = [
+      # bindgen needs the build platform's libclang. Apparently due to "splicing
+      # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
+      # right thing here.
+      pkgsBuildHost.rustPlatform.bindgenHook
     ];
   };
+in
+
+craneLib.buildPackage ( commonAttrs // {
+  cargoArtifacts = craneLib.buildDepsOnly (commonAttrs // {
+    env = buildDepsOnlyEnv;
+  });
 
   cargoExtraArgs = "--locked "
     + lib.optionalString
@@ -68,18 +83,11 @@ craneLib.buildPackage rec {
   # This is redundant with CI
   doCheck = false;
 
-  nativeBuildInputs = [
-    # bindgen needs the build platform's libclang. Apparently due to "splicing
-    # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
-    # right thing here.
-    pkgsBuildHost.rustPlatform.bindgenHook
-  ];
-
-  inherit env;
+  env = buildPackageEnv;
 
   passthru = {
-    inherit env;
+    env = buildPackageEnv;
   };
 
-  meta.mainProgram = pname;
-}
+  meta.mainProgram = commonAttrs.pname;
+})