nix stuff

foldu · Feb 16, 2020 · 50020d0 · 50020d0
1 parent 0d789d5
commit 50020d0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+eval "$(lorri direnv)"
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,9 @@
+let
+  pkgs = import <nixpkgs> {};
+in
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    protobuf
+  ];
+  PROTOC = "${pkgs.protobuf}/bin/protoc";
+}
diff --git a/tgcd/Cargo.toml b/tgcd/Cargo.toml
@@ -20,4 +20,3 @@ tonic = "0.1.0"
 
 [build-dependencies]
 tonic-build = "0.1.0"
-which = "3.1.0"
diff --git a/tgcd/build.rs b/tgcd/build.rs
@@ -1,6 +1,8 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let protoc = which::which("protoc").map_err(|e| format!("`protoc` not found, please install it: {}", e))?;
-    std::env::set_var("PROTOC", &protoc);
+    // force local protoc
+    // this doesn't work
+    //let protoc = which::which("protoc").map_err(|e| format!("`protoc` not found, please install it: {}", e))?;
+    //std::env::set_var("PROTOC", &protoc);
     tonic_build::compile_protos("proto/tgcd.proto")?;
     Ok(())
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ tonic = "0.1.0"

		[build-dependencies]
		tonic-build = "0.1.0"
		which = "3.1.0"