diff --git a/crates/aiken/src/cmd/mod.rs b/crates/aiken/src/cmd/mod.rs
index 1fa5b2ea..5dae8375 100644
--- a/crates/aiken/src/cmd/mod.rs
+++ b/crates/aiken/src/cmd/mod.rs
@@ -1,5 +1,4 @@
 use clap::Parser;
-use std::env;
 
 pub mod blueprint;
 pub mod build;
@@ -57,6 +56,6 @@ fn version() -> String {
     format!(
         "v{} {}",
         built_info::PKG_VERSION,
-        built_info::GIT_COMMIT_HASH_SHORT
+        built_info::GIT_COMMIT_HASH_SHORT.unwrap_or("unknown")
     )
 }
diff --git a/flake.nix b/flake.nix
index bd4ba2eb..db67c3bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,8 @@
           GIT_COMMIT_HASH_SHORT = self.shortRev or "dirty"; # or self.dirtyRev;
           postPatch = ''
             substituteInPlace crates/aiken/src/cmd/mod.rs \
-              --replace  "built_info::GIT_COMMIT_HASH_SHORT" "\"$GIT_COMMIT_HASH_SHORT\".to_string()"
+              --replace  "built_info::GIT_COMMIT_HASH_SHORT" \
+              "Some(\"$GIT_COMMIT_HASH_SHORT\")"
           '';
           
           postInstall = ''