1 files changed, 24 insertions, 16 deletions
diff --git a/tvix/store/build.rs b/tvix/store/build.rs
index e75f021a2bcf..a021dc328af6 100644
--- a/tvix/store/build.rs
+++ b/tvix/store/build.rs
@@ -12,21 +12,29 @@ fn main() -> Result<()> {
         builder = builder.file_descriptor_set_path(descriptor_path);
     };
 
-    builder.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(),
-        }],
-    )?;
+    // https://github.com/hyperium/tonic/issues/908
+    let mut config = prost_build::Config::new();
+    config.bytes(["."]);
+
+    builder
+        .build_server(true)
+        .build_client(true)
+        .compile_with_config(
+            config,
+            &[
+                "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(())
 }