From cfb810d81a4f5ba60e8d3c5502390d60799aa636 Mon Sep 17 00:00:00 2001
From: Brian Olsen <brian@maven-group.org>
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 <cbrewster@hey.com>
Reviewed-by: flokli <flokli@flokli.de>
---
 tvix/Cargo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tvix/Cargo.nix')

diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 356c1e992990..f0eb27a6ef35 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -2190,9 +2190,9 @@ rec {
         edition = "2018";
         workspace_member = null;
         src = pkgs.fetchgit {
-          url = "https://github.com/cloud-hypervisor/fuse-backend-rs";
-          rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08";
-          sha256 = "0f70f0wxkx4h18wvkpnnpxhyzvg6f9z1063334w1nlfg0n15wb9y";
+          url = "https://github.com/griff/fuse-backend-rs";
+          rev = "70b835cada7e1f18e5cbb13f6c4b698ba203c820";
+          sha256 = "107iaw8zqsz888xh9nkq3vvki1c1rqqqg0mncdplradhhn7wp3kp";
         };
         authors = [
           "Liu Bo <bo.liu@linux.alibaba.com>"
-- 
cgit 1.4.1