From 9da04cc7dbadb156efa0aeba2e8d0f3fb75a874b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 16:48:34 -0600 Subject: [PATCH 1/3] afuse: format --- pkgs/os-specific/linux/afuse/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 33d950b76cd6..587f1305741f 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + fuse, +}: stdenv.mkDerivation rec { pname = "afuse"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ fuse ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 265c6a8046e34560e7486c5ee37dc2bd5ff5e4d0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 16:50:14 -0600 Subject: [PATCH 2/3] afuse: fix darwin build --- .../linux/afuse/001-darwin-fdatasync.patch | 15 +++++++++++++++ pkgs/os-specific/linux/afuse/default.nix | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch diff --git a/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch b/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch new file mode 100644 index 000000000000..6a576c3a01a3 --- /dev/null +++ b/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch @@ -0,0 +1,15 @@ +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]) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 587f1305741f..f5d57ce67b1c 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -22,8 +22,11 @@ stdenv.mkDerivation rec { 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 \ From 0d204871a02d071f0a753cef09653bafd0beb635 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 5 Nov 2024 14:17:17 -0600 Subject: [PATCH 3/3] afuse: replace -> replace-fail --- pkgs/os-specific/linux/afuse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index f5d57ce67b1c..81b168a4712e 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 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' \ "" '';