diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index a7c9421f46ad..60670708f4bc 100644 --- a/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,25 +2,28 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.28.3"; + version = "2.32.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "1w6p3svc2yknp6swqg8lax6n9b31lyplb3j7r8nv14hbq4hymylx"; + sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; }; nativeBuildInputs = [ automake autoconf pkgconfig gettext libtool pandoc which ]; + prePatch = '' + sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile + ''; buildInputs = [ attr libiconv ]; preConfigure = '' echo "${version}" > VERSION ''; - makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "XATTR_AVAILABLE=1" "PREFIX=/" "SBINDIR=/bin" ]; enableParallelBuilding = true; postFixup = '' |