public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuse3: 3.2.5 -> 3.2.6

Browse Source
This commit is contained in:
Michael Weiss 2018-08-31 21:36:37 +02:00
parent e02816960a
commit bf0f63090b
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/fuse/default.nix
View File

@ -11,7 +11,7 @@ in {
}; };
fuse_3 = mkFuse { fuse_3 = mkFuse {
version = "3.2.5"; version = "3.2.6";
sha256Hash = "0ibf2isbkm8p1gfaqpqblwsg0lm4s1rmcipv1qcg0wc4wwsbnqpx"; sha256Hash = "0harsla45b0pj3khgxkcwfr2qd8pahg70ygki9i0a8pzscy64sl2";
}; };
} }

42
pkgs/os-specific/linux/fuse/fuse3-install.patch
View File

@ -1,11 +1,15 @@
--- a/util/install_helper.sh 2018-04-01 01:05:19.613723599 +0200 --- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200
+++ b/util/install_helper.sh 2018-04-01 01:06:02.952845382 +0200 +++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200
@@ -11,22 +11,14 @@ @@ -22,30 +22,11 @@
udevrulesdir="$3" DESTDIR="${DESTDIR%/}"
prefix="${MESON_INSTALL_DESTDIR_PREFIX}" fi
-chown root:root "${DESTDIR}${bindir}/fusermount3"
-chmod u+s "${DESTDIR}${bindir}/fusermount3"
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
"${DESTDIR}${sysconfdir}/fuse.conf"
-chown root:root "${prefix}/${bindir}/fusermount3"
-chmod u+s "${prefix}/${bindir}/fusermount3"
- -
-if test ! -e "${DESTDIR}/dev/fuse"; then -if test ! -e "${DESTDIR}/dev/fuse"; then
- mkdir -p "${DESTDIR}/dev" - mkdir -p "${DESTDIR}/dev"
@ -13,16 +17,18 @@
-fi -fi
- -
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
- "${DESTDIR}/${udevrulesdir}/99-fuse3.rules" - "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+ "${prefix}/${udevrulesdir}/99-fuse3.rules" + "${sysconfdir}/udev/rules.d/99-fuse3.rules"
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
- "${DESTDIR}/etc/init.d/fuse3" "${DESTDIR}${sysconfdir}/init.d/fuse3"
+ "${prefix}/etc/init.d/fuse3" -
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ -if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
- "${DESTDIR}/etc/fuse.conf" - /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
+ "${prefix}/etc/fuse.conf" -else
- echo "== FURTHER ACTION REQUIRED =="
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then - echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
/usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true -fi
-
-