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

fuse3: 3.9.2 -> 3.9.4 (#95072)

Browse Source 
Note: Version 3.9.3 and 3.9.4 are equivalent:
"This was an "accidental" release, it is equivalent to 3.9.3."
This commit is contained in:
Michael Weiss 2020-08-10 16:04:55 +02:00 committed by GitHub
parent d3a7373a7a
commit a3c71c3e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, fusePackages, utillinux, gettext , fusePackages, utillinux, gettext
, meson, ninja, pkgconfig , meson, ninja, pkg-config
, autoreconfHook , autoreconfHook
, python3Packages, which , python3Packages, which
}: }:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);
nativeBuildInputs = if isFuse3 nativeBuildInputs = if isFuse3
then [ meson ninja pkgconfig ] then [ meson ninja pkg-config ]
else [ autoreconfHook gettext ]; else [ autoreconfHook gettext ];
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
@ -60,6 +60,10 @@ in stdenv.mkDerivation rec {
# ./fuse3-install_man.patch) # ./fuse3-install_man.patch)
install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1 install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8 install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
# TODO: Temporary version fix:
substituteInPlace meson.build \
--replace "version: '3.9.3'" "version: '${version}'"
'' else '' '' else ''
sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
./makeconf.sh ./makeconf.sh

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

@ -11,7 +11,7 @@ in {
}; };
fuse_3 = mkFuse { fuse_3 = mkFuse {
version = "3.9.2"; version = "3.9.4";
sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843"; sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b";
}; };
} }