rclone: update to fuse3

This was forgotten in the 1.62.0 update
see https://rclone.org/changelog/#v1-62-0-2023-03-14

We cannot remove (lib)fuse as it still compiles against it
see 8f0e9f9f6b/.github/workflows/build.yml (L127)

Closes #291268
This commit is contained in:
Sandro Jäckel 2024-02-26 15:56:08 +01:00
parent 3bbde81485
commit 354c8401a4
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5

View file

@ -1,6 +1,6 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles
, makeWrapper
, enableCmount ? true, fuse, macfuse-stubs
, enableCmount ? true, fuse, fuse3, macfuse-stubs
, librclone
}:
@ -46,12 +46,12 @@ buildGoModule rec {
ln -s $out/bin/rclone $out/bin/rclonefs
ln -s $out/bin/rclone $out/bin/mount.rclone
'' + lib.optionalString (enableCmount && !stdenv.isDarwin)
# use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount,
# use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3,
# as the setuid wrapper is required as non-root on NixOS.
''
wrapProgram $out/bin/rclone \
--suffix PATH : "${lib.makeBinPath [ fuse ] }" \
--prefix LD_LIBRARY_PATH : "${fuse}/lib"
--suffix PATH : "${lib.makeBinPath [ fuse3 ] }" \
--prefix LD_LIBRARY_PATH : "${fuse3}/lib"
'';
passthru.tests = {