tjh.dev
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).
(cherry picked from commit c00b5bf6a2ec642c7088c22f825d56629ebbba5e)
+6
-4
pkgs/os-specific/linux/fuse/common.nix
+6
-4
pkgs/os-specific/linux/fuse/common.nix
···
25
25
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
26
26
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
27
27
})
28
-
++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
28
+
++ stdenv.lib.optional isFuse3 ./fuse3-install.patch
29
+
# TODO: Only relevant for 3.2.2 (opened an upstream issue)
30
+
++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;
29
31
30
32
31
33
nativeBuildInputs = if isFuse3
···
61
63
postFixup = "cd $out\n" + (if isFuse3 then ''
62
64
mv bin/mount.fuse3 bin/mount.fuse
63
65
64
-
install -D -m555 bin/mount.fuse $common/bin/mount.fuse
65
-
install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules
66
+
install -D -m555 etc/fuse.conf $common/etc/fuse.conf
67
+
install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules
66
68
install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz
67
69
'' else ''
68
-
cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse
70
+
cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf
69
71
cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules
70
72
cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz
71
73
'');
+2
-2
pkgs/os-specific/linux/fuse/default.nix
+2
-2
pkgs/os-specific/linux/fuse/default.nix
···
13
13
};
14
14
15
15
fuse_3 = mkFuse {
16
-
version = "3.2.1";
17
-
sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0";
16
+
version = "3.2.2";
17
+
sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";
18
18
maintainers = [ maintainers.primeos ];
19
19
};
20
20
}
+8
pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
+8
pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
···
1
+
--- a/meson.build 2018-04-01 01:05:19.612723597 +0200
2
+
+++ b/meson.build 2018-04-01 01:40:58.171109615 +0200
3
+
@@ -1,4 +1,4 @@
4
+
-project('libfuse3', 'c', version: '3.2.1',
5
+
+project('libfuse3', 'c', version: '3.2.2',
6
+
meson_version: '>= 0.38',
7
+
default_options: [ 'buildtype=debugoptimized' ])
8
+
+8
-4
pkgs/os-specific/linux/fuse/fuse3-install.patch
+8
-4
pkgs/os-specific/linux/fuse/fuse3-install.patch
···
1
-
--- a/util/install_helper.sh 1970-01-01 01:00:01.000000000 +0100
2
-
+++ b/util/install_helper.sh 2017-09-21 23:43:50.703942577 +0200
3
-
@@ -11,19 +11,11 @@
1
+
--- a/util/install_helper.sh 2018-04-01 01:05:19.613723599 +0200
2
+
+++ b/util/install_helper.sh 2018-04-01 01:06:02.952845382 +0200
3
+
@@ -11,22 +11,14 @@
4
4
udevrulesdir="$3"
5
5
prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
6
6
···
14
14
-
15
15
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
16
16
- "${DESTDIR}/${udevrulesdir}/99-fuse3.rules"
17
-
+ "${prefix}/${udevrulesdir}/99-fuse.rules"
17
+
+ "${prefix}/${udevrulesdir}/99-fuse3.rules"
18
18
19
19
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
20
20
- "${DESTDIR}/etc/init.d/fuse3"
21
21
+ "${prefix}/etc/init.d/fuse3"
22
22
23
+
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
24
+
- "${DESTDIR}/etc/fuse.conf"
25
+
+ "${prefix}/etc/fuse.conf"
26
+
23
27
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
24
28
/usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true