mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/build): tonic-reflection feature needs castore with it too

Browse source 
If building tvix-build with the tonic-reflection feature, it needs
to import `tvix_castore::proto::FILE_DESCRIPTOR_SET`, which is only
available if tvix-castore is built with the `tonic-reflection` feature.

Change-Id: I355b4c5b4c1333d5cc56335de47ad5d2f1db6337
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11716
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-05-26 18:19:23 +02:00 committed by clbot
parent 9586e5c30d
commit ca542440a5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/Cargo.nix
View file

@ -12760,7 +12760,7 @@ rec {
} }
]; ];
features = { features = {
"tonic-reflection" = [ "dep:tonic-reflection" ]; "tonic-reflection" = [ "dep:tonic-reflection" "tvix-castore/tonic-reflection" ];
}; };
resolvedDefaultFeatures = [ "default" "tonic-reflection" ]; resolvedDefaultFeatures = [ "default" "tonic-reflection" ];
}; };

2
tvix/build/Cargo.toml
View file

@ -27,7 +27,7 @@ tonic-build = "0.11.0"
[features] [features]
default = [] default = []
tonic-reflection = ["dep:tonic-reflection"] tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"]
[dev-dependencies] [dev-dependencies]
rstest = "0.19.0" rstest = "0.19.0"