diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index a0981de42b0..4d28869d160 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { - name = "mergerfs-${version}"; - version = "2.26.0"; + pname = "mergerfs"; + version = "2.26.1"; src = fetchFromGitHub { owner = "trapexit"; - repo = "mergerfs"; + repo = pname; rev = version; - sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9"; + sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3"; }; nativeBuildInputs = [ @@ -17,21 +17,20 @@ stdenv.mkDerivation rec { buildInputs = [ attr libiconv ]; preConfigure = '' - cat > src/version.hpp < VERSION ''; - makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + enableParallelBuilding = true; postFixup = '' - ln -s $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.mergerfs ''; meta = { description = "A FUSE based union filesystem"; - homepage = https://github.com/trapexit/mergerfs; + homepage = "https://github.com/trapexit/mergerfs"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];