From 83dd591272a71cd499ff6019f7bd2f8db4f71b6f Mon Sep 17 00:00:00 2001
From: Anton Bulakh <self@necauqua.dev>
Date: Sat, 24 Jun 2023 08:39:27 +0300
Subject: [PATCH] nix: dont install fake binaries and fix dirty jj version

---
 build.rs  | 6 ++++++
 flake.nix | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/build.rs b/build.rs
index 15469379c..0b3f473b4 100644
--- a/build.rs
+++ b/build.rs
@@ -37,6 +37,12 @@ fn main() -> std::io::Result<()> {
 }
 
 fn get_git_hash() -> Option<String> {
+    if let Some(nix_hash) = std::env::var("NIX_JJ_GIT_HASH")
+        .ok()
+        .filter(|s| !s.is_empty())
+    {
+        return Some(nix_hash);
+    }
     if let Ok(output) = Command::new("jj")
         .args([
             "--ignore-working-copy",
diff --git a/flake.nix b/flake.nix
index 193291405..194e7df6d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,8 @@
           version = "unstable-${self.shortRev or "dirty"}";
           buildNoDefaultFeatures = true;
           buildFeatures = [];
+          cargoBuildFlags = ["--bin" "jj"]; # don't build and install the fake editors
+          useNextest = true;
           src = filterSrc ./. [
             ".*\\.nix$"
             "^.jj/"
@@ -64,6 +66,7 @@
             ];
           ZSTD_SYS_USE_PKG_CONFIG = "1";
           LIBSSH2_SYS_USE_PKG_CONFIG = "1";
+          NIX_JJ_GIT_HASH = self.rev or "";
           postInstall = ''
             $out/bin/jj util mangen > ./jj.1
             installManPage ./jj.1
@@ -106,6 +109,9 @@
           openssl zstd libgit2 libssh2
           pkg-config
 
+          # Make sure rust-analyzer is present
+          rust-analyzer
+
           # Additional tools recommended by contributing.md
           cargo-deny
           cargo-insta