3 files changed, 22 insertions, 17 deletions
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index c807da760ab5..2e03788067cb 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -6,6 +6,8 @@ edition = "2021"
 [dependencies]
 blake3 = { version = "1.3.1", features = ["rayon", "std"] }
 prost = "0.11.2"
+tonic = "0.8.2"
 
 [build-dependencies]
 prost-build = "0.11.2"
+tonic-build = "0.8.2"
diff --git a/tvix/store/build.rs b/tvix/store/build.rs
index 4d3dc513f672..335e87b6c1d8 100644
--- a/tvix/store/build.rs
+++ b/tvix/store/build.rs
@@ -1,21 +1,24 @@
 use std::io::Result;
 
 fn main() -> Result<()> {
-    prost_build::compile_protos(
-        &[
-            "tvix/store/protos/castore.proto",
-            "tvix/store/protos/pathinfo.proto",
-            "tvix/store/protos/rpc_blobstore.proto",
-            "tvix/store/protos/rpc_directory.proto",
-            "tvix/store/protos/rpc_pathinfo.proto",
-        ],
-        // If we are in running `cargo build` manually, using `../..` works fine,
-        // but in case we run inside a nix build, we need to instead point PROTO_ROOT
-        // to a sparseTree containing that structure.
-        &[match std::env::var_os(&"PROTO_ROOT") {
-            Some(proto_root) => proto_root.to_str().unwrap().to_owned(),
-            None => "../..".to_string(),
-        }],
-    )?;
+    tonic_build::configure()
+        .build_server(true)
+        .build_client(true)
+        .compile(
+            &[
+                "tvix/store/protos/castore.proto",
+                "tvix/store/protos/pathinfo.proto",
+                "tvix/store/protos/rpc_blobstore.proto",
+                "tvix/store/protos/rpc_directory.proto",
+                "tvix/store/protos/rpc_pathinfo.proto",
+            ],
+            // If we are in running `cargo build` manually, using `../..` works fine,
+            // but in case we run inside a nix build, we need to instead point PROTO_ROOT
+            // to a sparseTree containing that structure.
+            &[match std::env::var_os(&"PROTO_ROOT") {
+                Some(proto_root) => proto_root.to_str().unwrap().to_owned(),
+                None => "../..".to_string(),
+            }],
+        )?;
     Ok(())
 }
diff --git a/tvix/store/src/proto.rs b/tvix/store/src/proto.rs
index f819d7b4fc8f..de8095495e58 100644
--- a/tvix/store/src/proto.rs
+++ b/tvix/store/src/proto.rs
@@ -1,6 +1,6 @@
 use prost::Message;
 
-include!(concat!(env!("OUT_DIR"), "/tvix.store.v1.rs"));
+tonic::include_proto!("tvix.store.v1");
 
 impl Directory {
     // The size of a directory is the number of all regular and symlink elements,