maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/store): Remove virtiofs from default features

Browse source 
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 <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Connor Brewster 2023-10-06 21:17:35 -05:00 • committed by clbot
parent 9c0d66197b
commit 9019d8568e
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tvix/default.nix
View file

@ -5,6 +5,8 @@ let
# crate override for crates that need protobuf
protobufDep = prev: (prev.nativeBuildInputs or [ ]) ++ [ pkgs.protobuf ];
iconvDarwinDep = lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
# fuse-backend-rs uses DiskArbitration framework to handle mount/unmount on Darwin
diskArbitrationDep = lib.optionals pkgs.stdenv.isDarwin [ pkgs.buildPackages.darwin.apple_sdk.frameworks.DiskArbitration ];
# Load the crate2nix crate tree.
crates = import ./Cargo.nix {
@ -44,6 +46,7 @@ let
tvix-store = prev: {
PROTO_ROOT = depot.tvix.proto;
nativeBuildInputs = protobufDep prev;
buildInputs = prev.buildInputs or [ ] ++ diskArbitrationDep;
};
};
};