about summary refs log tree commit diff
path: root/tvix/Cargo.nix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-09-26T07·18+0300
committerclbot <clbot@tvl.fyi>2023-09-26T10·03+0000
commit7062fdc132232992abfef716eebac5d979318b27 (patch)
tree42ba6a10e7866e079e5e178517ce7081a6bada50 /tvix/Cargo.nix
parent10717605a2ceb736d1c1ad215f8a92ef30dd85c3 (diff)
chore(tvix/store): only depend on vhost-user-fs if virtiofs enabled r/6658
Change-Id: Iaf88d43df27b87548794a8dddc9a1e08279b8ffb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9471
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/Cargo.nix')
-rw-r--r--tvix/Cargo.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index f88f64291ae4..07be275e5681 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -8729,7 +8729,6 @@ rec {
             name = "fuse-backend-rs";
             packageId = "fuse-backend-rs";
             optional = true;
-            features = [ "vhost-user-fs" ];
           }
           {
             name = "futures";
@@ -8887,7 +8886,7 @@ rec {
           "fuse" = [ "fs" ];
           "reflection" = [ "tonic-reflection" ];
           "tonic-reflection" = [ "dep:tonic-reflection" ];
-          "virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" ];
+          "virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" "fuse-backend-rs?/vhost-user-fs" "fuse-backend-rs?/virtiofs" ];
         };
         resolvedDefaultFeatures = [ "default" "fs" "fuse" "reflection" "tonic-reflection" "virtiofs" ];
       };