diff options
| author | Brian Olsen <brian@maven-group.org> | 2023-09-29T16·50+0200 |
|---|---|---|
| committer | Brian Olsen <me@griff.name> | 2023-10-02T15·46+0000 |
| commit | cfb810d81a4f5ba60e8d3c5502390d60799aa636 (patch) | |
| tree | 0c3ddac2a5ee38151db245475d0159c09b6028cb /tvix/store/default.nix | |
| parent | 5c2cad0ac48d7f223fe76b27d3d7ea9d38529e25 (diff) | |
fix(tvix/store): Fix FUSE support on MacOS r/6687
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 <cbrewster@hey.com> Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/store/default.nix')
| -rw-r--r-- | tvix/store/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/store/default.nix b/tvix/store/default.nix index 90fa3f06a2d9..0372047e94fe 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); |