diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-08-10 16:04:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 16:04:55 +0200 |
| commit | a3c71c3e5dd688fc07628d360e48da0be23e74d7 (patch) | |
| tree | 74fb4ba24fba206f35bfe9f43bdd70b3edfb0f09 /pkgs/os-specific/linux/fuse | |
| parent | d3a7373a7a1a37aa107dfe7cf986cae1efa44560 (diff) | |
| download | nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar.gz nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar.bz2 nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar.lz nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar.xz nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.tar.zst nixpkgs-a3c71c3e5dd688fc07628d360e48da0be23e74d7.zip | |
fuse3: 3.9.2 -> 3.9.4 (#95072)
Note: Version 3.9.3 and 3.9.4 are equivalent: "This was an "accidental" release, it is equivalent to 3.9.3."
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index b0f684e6242..2010be53c2d 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -2,7 +2,7 @@ { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext -, meson, ninja, pkgconfig +, meson, ninja, pkg-config , autoreconfHook , python3Packages, which }: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); nativeBuildInputs = if isFuse3 - then [ meson ninja pkgconfig ] + then [ meson ninja pkg-config ] else [ autoreconfHook gettext ]; outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; @@ -60,6 +60,10 @@ in stdenv.mkDerivation rec { # ./fuse3-install_man.patch) 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 + + # TODO: Temporary version fix: + substituteInPlace meson.build \ + --replace "version: '3.9.3'" "version: '${version}'" '' else '' sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh ./makeconf.sh diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 4d2e12367de..8c342743dfc 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.9.2"; - sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843"; + version = "3.9.4"; + sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b"; }; } |