diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-04-01 01:55:14 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-04-01 01:55:14 +0200 |
| commit | c00b5bf6a2ec642c7088c22f825d56629ebbba5e (patch) | |
| tree | 1b14d4f81cde2b3c1c24ae4c15e5157fd5381fde /pkgs/os-specific/linux/fuse/common.nix | |
| parent | a4dc9ef13e32c724668ae579b8d72d104ef372c3 (diff) | |
| download | nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar.gz nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar.bz2 nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar.lz nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar.xz nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.tar.zst nixpkgs-c00b5bf6a2ec642c7088c22f825d56629ebbba5e.zip | |
fuse3: 3.2.1 -> 3.2.2
Stop using bin/mount.fuse from fuse3 for fuse2 (mount.fuse from fuse3 isn't guaranteed to remain backwards compatible).
Diffstat (limited to 'pkgs/os-specific/linux/fuse/common.nix')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index a10a4f466c7..a890a3d102f 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -28,7 +28,9 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; + ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch + # TODO: Only relevant for 3.2.2 (opened an upstream issue) + ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch; nativeBuildInputs = if isFuse3 @@ -63,11 +65,11 @@ in stdenv.mkDerivation rec { postFixup = "cd $out\n" + (if isFuse3 then '' mv bin/mount.fuse3 bin/mount.fuse - install -D -m555 bin/mount.fuse $common/bin/mount.fuse - install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules + install -D -m555 etc/fuse.conf $common/etc/fuse.conf + install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz '' else '' - cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse + cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz ''); |