diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
| commit | a7a8f8253db3f32cc15baf527d36ef7171425eba (patch) | |
| tree | 5de25f1c82e7892f6aec7b3e5ddb718ff0c50df2 /pkgs/os-specific/linux/fuse/fuse3-install.patch | |
| parent | f31242fcfd14e870eb6898fc8849bc4dee883054 (diff) | |
| parent | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (diff) | |
| download | nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.gz nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.bz2 nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.lz nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.xz nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.zst nixpkgs-a7a8f8253db3f32cc15baf527d36ef7171425eba.zip | |
Merge #263535: staging-next 2023-10-26
Diffstat (limited to 'pkgs/os-specific/linux/fuse/fuse3-install.patch')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/fuse3-install.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 147bcb439fb..769e3088664 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,18 +1,20 @@ ---- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 -+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 -@@ -37,10 +37,10 @@ - fi +--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200 ++++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200 +@@ -39,12 +39,12 @@ - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + if [ "${udevrulesdir}" != "" ]; then + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" + "${sysconfdir}${udevrulesdir}/99-fuse3.rules" + fi - install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ -- "${DESTDIR}/etc/init.d/fuse3" -+ "${sysconfdir}/init.d/fuse3" - + if [ "$initscriptdir" != "" ]; then + install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${initscriptdir}/fuse3" ++ "${sysconfdir}${initscriptdir}/fuse3" - if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build |