Skip to content

Commit

Permalink
rclone: update to fuse3
Browse files Browse the repository at this point in the history
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 https://github.com/rclone/rclone/blob/8f0e9f9f6bd78f6ac7488ac48bbe7e9a9ba418ab/.github/workflows/build.yml#L127

Closes NixOS#291268
  • Loading branch information
SuperSandro2000 committed Feb 26, 2024
1 parent 3bbde81 commit 354c840
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/networking/sync/rclone/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles
, makeWrapper
, enableCmount ? true, fuse, macfuse-stubs
, enableCmount ? true, fuse, fuse3, macfuse-stubs
, librclone
}:

Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 354c840

Please sign in to comment.