crates/aiken/src/cmd/mod.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use std::env;
 
 pub mod blueprint;
 pub mod build;
@@ -56,6 +57,7 @@ fn version() -> String {
     format!(
         "v{} {}",
         built_info::PKG_VERSION,
-        built_info::GIT_COMMIT_HASH_SHORT.unwrap_or("unknown")
+        built_info::GIT_COMMIT_HASH_SHORT
+            .unwrap_or(&env::var("GIT_COMMIT_HASH_SHORT").unwrap_or("unknown".to_string()))
     )
 }

flake.nix

@@ -31,12 +31,10 @@
           src = pkgs.lib.cleanSourceWith { src = self; };
 
           cargoLock.lockFile = ./Cargo.lock;
+          GIT_COMMIT_HASH_SHORT = self.rev or "dirty"; #  or self.dirtyRev;
 
-          GIT_COMMIT_HASH_SHORT = self.shortRev or "dirty"; # or self.dirtyRev;
           postPatch = ''
-            substituteInPlace crates/aiken/src/cmd/mod.rs \
+          substituteInPlace crates/aiken/src/cmd/mod.rs --replace  "built_info::GIT_COMMIT_HASH_SHORT" "\"$GIT_COMMIT_HASH_SHORT\""
-              --replace  "built_info::GIT_COMMIT_HASH_SHORT" \
-              "Some(\"$GIT_COMMIT_HASH_SHORT\")"
           '';
           
           postInstall = ''