Unverified Commit 2cef7a0b authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

mergerfs: 2.40.2 -> 2.41.1 (#469169)

parents 693a5a71 cda88a11

pkgs/tools/filesystems/mergerfs/default.nix

+13 −5
Original line number Diff line number Diff line
@@ -15,15 +15,23 @@ 


stdenv.mkDerivation rec {

  pname = "mergerfs";

  version = "2.40.2";

  version = "2.41.1";



  src = fetchFromGitHub {

    owner = "trapexit";

    repo = pname;

    rev = version;

    sha256 = "sha256-3DfSGuTtM+h0IdtsIhLVXQxX5/Tj9G5Qcha3DWmyyq4=";

    sha256 = "sha256-pXge+/5Ti4+e0aSbWLg6roIcg+3foAvSHP/Obd0EiE4=";

  };



  env.NIX_CFLAGS_COMPILE = toString [

    "-Wno-error=unused-result"

    "-Wno-error=maybe-uninitialized"



    # NOTE: _FORTIFY_SOURCE requires compiling with optimization (-O)

    "-O"

  ];



  nativeBuildInputs = [

    automake

    autoconf
@@ -33,9 +41,7 @@ stdenv.mkDerivation rec { 
    pandoc

    which

  ];

  prePatch = ''

    sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile

  '';



  buildInputs = [

    attr

    libiconv
@@ -50,6 +56,8 @@ stdenv.mkDerivation rec { 
    "XATTR_AVAILABLE=1"

    "PREFIX=/"

    "SBINDIR=/bin"

    "CHMOD=true"

    "CHOWN=true"

  ];

  enableParallelBuilding = true;