mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
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:
parent
3bbde81485
commit
354c8401a4
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue