Unverified Commit 14c5219b authored by Theodore Ni's avatar Theodore Ni Committed by GitHub
Browse files

afuse: fix darwin build (#353727)

parents 1e9e641a 0d204871
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
diff --git a/configure.ac b/configure.ac
index ef07d70..2da26aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,9 @@ if test "$have_fuse_opt_parse" = no; then
 fi
 AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)


-AC_CHECK_FUNCS([setxattr fdatasync getline fgetln])
+AC_CHECK_FUNCS([setxattr getline fgetln])

 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  compat/Makefile])
+16 −3
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }:
{
  lib,
  stdenv,
  fetchFromGitHub,
  pkg-config,
  autoreconfHook,
  fuse,
}:

stdenv.mkDerivation rec {
  pname = "afuse";
@@ -11,12 +18,18 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
  nativeBuildInputs = [
    autoreconfHook
    pkg-config
  ];

  buildInputs = [ fuse ];

  patches = [ ./001-darwin-fdatasync.patch ];

  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
    # Fix the build on macOS with macFUSE installed
    substituteInPlace configure.ac --replace \
    substituteInPlace configure.ac --replace-fail \
      'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \
      ""
  '';