diff options
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/shell.nix | 13 | ||||
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 9 |
2 files changed, 14 insertions, 8 deletions
diff --git a/tvix/shell.nix b/tvix/shell.nix index eae0931bfd09..947cda269b2f 100644 --- a/tvix/shell.nix +++ b/tvix/shell.nix @@ -16,6 +16,19 @@ ./nixpkgs/cbtemulator-uds.patch ]; }); + + # macFUSE bump containing fix for https://github.com/osxfuse/osxfuse/issues/974 + # https://github.com/NixOS/nixpkgs/pull/320197 + fuse = + if super.stdenv.isDarwin then + super.fuse.overrideAttrs + (old: rec { + version = "4.8.0"; + src = super.fetchurl { + url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; + }; + }) else super.fuse; }) ]; }) diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index 4353cbdd036a..9e81e59f12b9 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -185,19 +185,12 @@ enum Commands { }, } -#[cfg(all(feature = "fuse", not(target_os = "macos")))] +#[cfg(feature = "fuse")] fn default_threads() -> usize { std::thread::available_parallelism() .map(|threads| threads.into()) .unwrap_or(4) } -// On MacFUSE only a single channel will receive ENODEV when the file system is -// unmounted and so all the other channels will block forever. -// See https://github.com/osxfuse/osxfuse/issues/974 -#[cfg(all(feature = "fuse", target_os = "macos"))] -fn default_threads() -> usize { - 1 -} #[instrument(fields(indicatif.pb_show=1), skip(cli))] async fn run_cli(cli: Cli) -> Result<(), Box<dyn std::error::Error>> { |