ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

fuse3: 3.2.0 -> 3.2.1

Browse Source
This commit is contained in:
Michael Weiss 2017-11-15 13:20:54 +01:00
parent 73af2b27c9
commit f46003798e
4 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/fuse/common.nix
View File

@ -25,12 +25,7 @@ in stdenv.mkDerivation rec {
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
})
++ stdenv.lib.optionals isFuse3 [
./fuse3-no-udev.patch # only required for udevrulesdir
./fuse3-install.patch
# install_man makes the build non-reproducible by encoding the date
./fuse3-install_man.patch
];
++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
nativeBuildInputs = if isFuse3
@ -40,6 +35,8 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d";
preConfigure = ''
export MOUNT_FUSE_PATH=$out/sbin
export INIT_D_PATH=$TMPDIR/etc/init.d

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

@ -13,8 +13,8 @@ in {
};
fuse_3 = mkFuse {
version = "3.2.0";
sha256Hash = "0bfpwkfamg4rcbq1s7v5rblpisqq73z6d5j3dxypgqll07hfg51x";
version = "3.2.1";
sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0";
maintainers = [ maintainers.primeos ];
};
}

8
pkgs/os-specific/linux/fuse/fuse3-install_man.patch
View File

@ -1,8 +0,0 @@
--- a/doc/meson.build 1970-01-01 01:00:01.000000000 +0100
+++ b/doc/meson.build 2017-09-22 01:53:01.859190506 +0200
@@ -1,5 +1,4 @@
# Attention, emacs, please use -*- mode: python -*-
# (even though this isn't actually Python code)
-install_man('fusermount3.1', 'mount.fuse.8')

12
pkgs/os-specific/linux/fuse/fuse3-no-udev.patch
View File

@ -1,12 +0,0 @@
+++ b/util/meson.build 2017-09-23 20:59:31.555392297 +0200
--- a/util/meson.build 2017-09-23 20:59:58.333180437 +0200
@@ -18,8 +18,7 @@
install: true,
install_dir: get_option('sbindir'))
-udev = dependency('udev')
-udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
+udevrulesdir = 'etc/udev/rules.d'
meson.add_install_script('install_helper.sh', get_option('sysconfdir'),
get_option('bindir'), udevrulesdir)