diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-09-30 18:53:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 18:53:12 +0200 |
| commit | 4862f3c15fd5034a6a160c430655c867a028e185 (patch) | |
| tree | 96ad89bdf810dc8b2873e43cf62d5b28df6dfe41 /pkgs | |
| parent | bb9fb3d3eb6da10fd1117556c894ebc2dc917263 (diff) | |
| parent | 209b1e43471a853883ca3c862006894585baeb01 (diff) | |
| download | nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar.gz nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar.bz2 nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar.lz nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar.xz nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.tar.zst nixpkgs-4862f3c15fd5034a6a160c430655c867a028e185.zip | |
Merge pull request #140057 from DeeUnderscore/gocryptfs-fuse-suffix
gocryptfs: ensure fusermount setuid wrapper is used if present
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/gocryptfs/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 8cb9d58bc4e..2211d0e3103 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -51,9 +51,11 @@ buildGoModule rec { popd ''; + # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, + # as the setuid wrapper is required to use gocryptfs as non-root on NixOS postInstall = '' wrapProgram $out/bin/gocryptfs \ - --prefix PATH : ${lib.makeBinPath [ fuse ]} + --suffix PATH : ${lib.makeBinPath [ fuse ]} ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs ''; |