diff --git a/nix/pkgs/default/default.nix b/nix/pkgs/default/default.nix
index cb7be038..fc9ef5a7 100644
--- a/nix/pkgs/default/default.nix
+++ b/nix/pkgs/default/default.nix
@@ -57,9 +57,16 @@ let
         stdenv;
     });
 
-  buildPackageEnv = {
-    GRAPEVINE_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev;
-  } // buildDepsOnlyEnv;
+  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;
+    })
+    // buildDepsOnlyEnv;
 
   commonAttrs = {
     # Reading from cargoManifest directly instead of using