about summary refs log tree commit diff
path: root/tvix/store/build.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2022-11-12T23·23+0000
committerflokli <flokli@flokli.de>2022-12-26T11·38+0000
commit3676ce8d6dc30a5439beec4a705a416597124435 (patch)
treecef3871ee8ebd3d343b6e831ac29e726900e5d56 /tvix/store/build.rs
parent7fbac93940a44cf6b790aba16d316d9531558187 (diff)
feat(tvix/store): use tonic-build for protos r/5492
While prost-build already exposes protobuf message types as structs, we
actually need tonic-build too, to be able to get traits for all the RPC
services defined in the proto files.

Change-Id: I7f4c08454bf0d280d577975c7cdae13ccc2d933b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7320
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/build.rs')
-rw-r--r--tvix/store/build.rs35
1 files changed, 19 insertions, 16 deletions
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(())
 }