about summary refs log tree commit diff
path: root/tvix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-09-26T08·09+0300
committerclbot <clbot@tvl.fyi>2023-09-26T10·03+0000
commit329067f62954f09bcaf87a016f4211fdcf9789dd (patch)
treece578ef09bb8283265b66236c0fe3eb3a229b541 /tvix
parent7062fdc132232992abfef716eebac5d979318b27 (diff)
fix(tvix/cli): don't enable default features for tvix-store r/6659
These enable fuse and virtiofs features, which fail to build on MacOS.

tvix-cli needs neither of these to be built, so we can disable them.

Fixes b/240 (tvix-cli build on Darwin)

Change-Id: I991d947f31d0185aedd1c8a341f714f4eedd03c3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9474
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix')
-rw-r--r--tvix/Cargo.nix1
-rw-r--r--tvix/cli/Cargo.toml2
2 files changed, 2 insertions, 1 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 07be275e5681..130a89a1aee9 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -8473,6 +8473,7 @@ rec {
           {
             name = "tvix-store";
             packageId = "tvix-store";
+            usesDefaultFeatures = false;
           }
           {
             name = "wu-manber";
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml
index 577ee8bb9e87..94b010cc1efd 100644
--- a/tvix/cli/Cargo.toml
+++ b/tvix/cli/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/main.rs"
 [dependencies]
 nix-compat = { path = "../nix-compat" }
 tvix-castore = { path = "../castore" }
-tvix-store = { path = "../store", features = []}
+tvix-store = { path = "../store", default-features = false, features = []}
 tvix-eval = { path = "../eval" }
 bytes = "1.4.0"
 clap = { version = "4.0", features = ["derive", "env"] }