diff options
Diffstat (limited to 'tvix/build/build.rs')
-rw-r--r-- | tvix/build/build.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tvix/build/build.rs b/tvix/build/build.rs index c3518ea8772b..2fb8d86ee15f 100644 --- a/tvix/build/build.rs +++ b/tvix/build/build.rs @@ -12,27 +12,25 @@ fn main() -> Result<()> { builder = builder.file_descriptor_set_path(descriptor_path); }; - // https://github.com/hyperium/tonic/issues/908 - let mut config = prost_build::Config::new(); - config.bytes(["."]); - config.extern_path(".tvix.castore.v1", "::tvix_castore::proto"); - builder .build_server(true) .build_client(true) .emit_rerun_if_changed(false) - .compile_with_config( - config, + .bytes(["."]) + .extern_path(".tvix.castore.v1", "::tvix_castore::proto") + .compile_protos( &[ "tvix/build/protos/build.proto", "tvix/build/protos/rpc_build.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. + // to a custom tree containing that structure. &[match std::env::var_os("PROTO_ROOT") { Some(proto_root) => proto_root.to_str().unwrap().to_owned(), None => "../..".to_string(), }], - ) + )?; + + Ok(()) } |