From a7e450a7ffa21cf00070d0398ff4d0655e394181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 May 2026 23:47:45 +0200 Subject: [PATCH] rclone: remove fuse2 --- pkgs/by-name/rc/rclone/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix index 53d7c0822637..0ee5e84c6469 100644 --- a/pkgs/by-name/rc/rclone/package.nix +++ b/pkgs/by-name/rc/rclone/package.nix @@ -8,9 +8,7 @@ versionCheckHook, makeWrapper, enableCmount ? true, - fuse, fuse3, - macfuse-stubs, librclone, nix-update-script, }: @@ -40,11 +38,9 @@ buildGoModule (finalAttrs: { makeWrapper ]; - buildInputs = lib.optional enableCmount ( - if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse - ); + buildInputs = lib.optional enableCmount fuse3; - tags = lib.optionals enableCmount [ "cmount" ]; + tags = [ "fuse3" ] ++ lib.optionals enableCmount [ "cmount" ]; ldflags = [ "-s" @@ -54,7 +50,7 @@ buildGoModule (finalAttrs: { postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \ - --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"' + --replace-fail "fuse.h" "fuse3/fuse.h" ''; postInstall =