diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-05-11 21:48:38 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-05-11 22:12:53 +0200 |
commit | d3e3e131f565be1d72e98980e0e22cc0b05f46ec (patch) | |
tree | 4bc8cb8233d77199ba91980a9626d6fc03a30574 /pkgs/os-specific/linux/fuse/common.nix | |
parent | 4f06c77709cb23bd10927c85d4bf24ed4ed82eb2 (diff) | |
download | nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.gz nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.bz2 nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.lz nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.xz nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.zst nixpkgs-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.zip |
fuse3: 3.2.2 -> 3.2.3
Diffstat (limited to 'pkgs/os-specific/linux/fuse/common.nix')
-rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 95011653ad0..04a4a1a0e1f 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash, maintainers }: +{ version, sha256Hash }: { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext @@ -28,10 +28,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch - # TODO: Only relevant for 3.2.2 (opened an upstream issue) - ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch; - + ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] @@ -76,10 +73,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; - platforms = stdenv.lib.platforms.linux; - inherit maintainers; + platforms = platforms.linux; + maintainers = [ maintainers.primeos ]; }; } |