From 114e7ba577bff9fd1629a18b0aec279dcd696d0c Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 2 Mar 2025 10:57:13 -0800
Subject: [PATCH] allow supplying custom version extra info in nix

---
 nix/pkgs/default/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nix/pkgs/default/default.nix b/nix/pkgs/default/default.nix
index fc9ef5a7..543537ff 100644
--- a/nix/pkgs/default/default.nix
+++ b/nix/pkgs/default/default.nix
@@ -15,6 +15,9 @@
 , all-features ? false
 , features ? []
 , profile ? "release"
+, version-extra ? inputs.self.shortRev
+    or inputs.self.dirtyShortRev
+    or null,
 }:
 
 let
@@ -58,13 +61,8 @@ let
     });
 
   buildPackageEnv =
-    let
-      GRAPEVINE_VERSION_EXTRA = inputs.self.shortRev
-        or inputs.self.dirtyShortRev
-        or null;
-    in
-    (lib.optionalAttrs (GRAPEVINE_VERSION_EXTRA != null) {
-      inherit GRAPEVINE_VERSION_EXTRA;
+    (lib.optionalAttrs (version-extra != null) {
+      GRAPEVINE_VERSION_EXTRA = version-extra;
     })
     // buildDepsOnlyEnv;