summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Nagy <danielnagy@posteo.de>2022-03-19 20:49:56 +0100
committerDaniel Nagy <danielnagy@posteo.de>2022-03-19 23:17:48 +0100
commit1502634e1afa3b3bf0fac86ca15b6c71f0f40530 (patch)
treec88009d81d274e29f253e537c5b935d8816e589c
parent6b5006b249f007141692a3f294b01b13414c7516 (diff)
downloadnixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar.gz
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar.bz2
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar.lz
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar.xz
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.tar.zst
nixpkgs-1502634e1afa3b3bf0fac86ca15b6c71f0f40530.zip
rclone: prefix PATH of fuse
This is needed because `rclone` makes use of `fusermount` when mounting
filesystems.
-rw-r--r--pkgs/applications/networking/sync/rclone/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index e23ba5cdf2a..9ebd9db67f9 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -40,8 +40,13 @@ buildGoModule rec {
         ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell
         installShellCompletion rclone.$shell
       done
-    '' + lib.optionalString (enableCmount && !stdenv.isDarwin) ''
-      wrapProgram $out/bin/rclone --prefix LD_LIBRARY_PATH : "${fuse}/lib"
+    '' + lib.optionalString (enableCmount && !stdenv.isDarwin)
+      # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount,
+      # 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"
     '';
 
   meta = with lib; {