From 9019d8568e845afe9f2621bf3d5e1918a8ff5cf9 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 6 Oct 2023 21:17:35 -0500 Subject: fix(tvix/store): Remove virtiofs from default features vhost-user-backend doesn't support macOS yet, so the virtiofs features will not work on macOS. This removes it as a default feature which makes `cargo build` work out of the box on macOS. The `virtiofs` feature is enabled for Linux when building via Nix, but if being built by cargo directly, the feature must be enabled via a cargo flag. Change-Id: I2aaca9582f8e3dbcf9ee5f1b9831d614909f3799 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9555 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: Connor Brewster --- tvix/store/Cargo.toml | 2 +- tvix/store/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tvix/store') diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index d566ebed70..41a19d7ed1 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -80,7 +80,7 @@ tempfile = "3.3.0" tonic-mock = { git = "https://github.com/brainrake/tonic-mock", branch = "bump-dependencies" } [features] -default = ["fuse", "virtiofs", "tonic-reflection"] +default = ["fuse", "tonic-reflection"] fs = ["dep:libc", "dep:fuse-backend-rs"] virtiofs = [ "fs", diff --git a/tvix/store/default.nix b/tvix/store/default.nix index 0372047e94..35d2a22bb2 100644 --- a/tvix/store/default.nix +++ b/tvix/store/default.nix @@ -25,7 +25,8 @@ in (depot.tvix.crates.workspaceMembers.tvix-store.build.override { runTests = true; # virtiofs feature currently fails to build on Darwin. - features = if pkgs.stdenv.isDarwin then [ "fuse" "tonic-reflection" ] else [ "default" ]; + # we however can ship it for non-darwin. + features = if pkgs.stdenv.isDarwin then [ "default" ] else [ "default" "virtiofs" ]; }).overrideAttrs (_: { meta.ci.extraSteps = { import-docs = (mkImportCheck "tvix/store/docs" ./docs); -- cgit 1.4.1