Fix Nix build

aformatik · Jan 26, 2024 · eb26ff5 · eb26ff5
1 parent 138b417
commit eb26ff5
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 196 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ v011.json
 .direnv
 .xwin
 .codchi
+.wine
diff --git a/codchi/.gitignore b/codchi/.gitignore
@@ -1,4 +1,2 @@
 target
-.wine
 .idea
-.xwin
diff --git a/codchi/Cargo.lock b/codchi/Cargo.lock
diff --git a/codchi/Cargo.toml b/codchi/Cargo.toml
@@ -49,7 +49,7 @@ futures = "0.3"
 parity-tokio-ipc = "0.9.0"
 tarpc = { version = "0.33", features = [ "serde1", "tokio1", "serde-transport", "serde-transport-bincode" ] }
 
-tray-icon = "0.11.1"
+tray-icon = { version = "0.11.1", default-features = false }
 image = { version = "0.24", features = ["png"], default-features = false }
 tao = {version = "0.24.0", default-features = false }
 inquire = "0.6.2"

diff --git a/codchi/build.rs b/codchi/build.rs
@@ -30,9 +30,8 @@ fn main() -> Result<(), Box<dyn Error>> {
     }
 
     {
-        build_data::set_GIT_BRANCH();
-        build_data::set_GIT_COMMIT();
-        build_data::set_GIT_DIRTY();
+        let commit = build_data::exec("nix-git-commit", &[]).unwrap();
+        println!("cargo:rustc-env=GIT_COMMIT={}", commit);
         build_data::set_SOURCE_TIMESTAMP();
         build_data::no_debug_rebuilds();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,3 +38,4 @@ v011.json @@
     .direnv
     .xwin
     .codchi
+    .wine