diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-01 00:27:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 00:27:38 +0100 |
| commit | fb0f4579cd687c585e26631515e13c3b5fe6f68d (patch) | |
| tree | be6966e24c2672a11bfb440dcb14a62c1d0c3ffd | |
| parent | 8e7524d67555fceddd2eebae183320a49322f3ff (diff) | |
| parent | 354c8401a456cac33a4f4e3a0d8abedb2364b3f5 (diff) | |
Merge pull request #291585 from SuperSandro2000/rclone-fuse3
rclone: update to fuse3
| -rw-r--r-- | pkgs/applications/networking/sync/rclone/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 735133d641fe1..ebb0f17e784b9 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -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 = { |