Unnamed repository; edit this file 'description' to name the repository.
Make git revision available for nix flake builds (#12331)
0rphee 2024-12-26
parent c262fe4 · commit 7b9b932
-rw-r--r--flake.nix2
-rw-r--r--helix-loader/build.rs3
2 files changed, 4 insertions, 1 deletions
diff --git a/flake.nix b/flake.nix
index 2f3be94e..1fda3fa9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -138,6 +138,8 @@
cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
installShellCompletion contrib/completion/hx.{bash,fish,zsh}
'';
+ # set git revision for nix flake builds, see 'git_hash' in helix-loader/build.rs
+ HELIX_NIX_BUILD_REV = self.rev or self.dirtyRev or null;
});
helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
default = self.packages.${system}.helix;
diff --git a/helix-loader/build.rs b/helix-loader/build.rs
index ea068983..cfa3a9ad 100644
--- a/helix-loader/build.rs
+++ b/helix-loader/build.rs
@@ -20,7 +20,8 @@ fn main() {
.output()
.ok()
.filter(|output| output.status.success())
- .and_then(|x| String::from_utf8(x.stdout).ok());
+ .and_then(|x| String::from_utf8(x.stdout).ok())
+ .or_else(|| option_env!("HELIX_NIX_BUILD_REV").map(|s| s.to_string()));
let calver = get_calver();
let version: Cow<_> = match &git_hash {