From cfb810d81a4f5ba60e8d3c5502390d60799aa636 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 29 Sep 2023 18:50:50 +0200 Subject: fix(tvix/store): Fix FUSE support on MacOS This partially fixes b/312 and gets FUSE to work again on MacOS. It is mostly small type changes and an update to fuse-backend-rs because upstream currently doesn't work with MacFuse. It also sets the default FUSE thread count on MacOS to 1 because otherwise the mount command will hang when shutting down as only one thread gets ENODEV and all the others just keep blocking. Change-Id: Ifb3c4268caf296c487049c1dc4618acb32497f44 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9490 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster Reviewed-by: flokli --- tvix/store/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tvix/store/default.nix') diff --git a/tvix/store/default.nix b/tvix/store/default.nix index 90fa3f06a2..0372047e94 100644 --- a/tvix/store/default.nix +++ b/tvix/store/default.nix @@ -24,8 +24,8 @@ in (depot.tvix.crates.workspaceMembers.tvix-store.build.override { runTests = true; - # both fuse and virtiofs features currently fail to build on Darwin. - features = if pkgs.stdenv.isDarwin then [ "tonic-reflection" ] else [ "default" ]; + # virtiofs feature currently fails to build on Darwin. + features = if pkgs.stdenv.isDarwin then [ "fuse" "tonic-reflection" ] else [ "default" ]; }).overrideAttrs (_: { meta.ci.extraSteps = { import-docs = (mkImportCheck "tvix/store/docs" ./docs); -- cgit 1.4.1