From d139ff7561a884bb88545176546293ccd90ac14c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 06:56:07 +0000
Subject: [PATCH] bindfs: 1.17.7 -> 1.18.1

---
 pkgs/by-name/bi/bindfs/package.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bindfs/package.nix b/pkgs/by-name/bi/bindfs/package.nix
index f84391880f57..aa1b715bbd70 100644
--- a/pkgs/by-name/bi/bindfs/package.nix
+++ b/pkgs/by-name/bi/bindfs/package.nix
@@ -2,21 +2,36 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
+  autoreconfHook,
   pkg-config,
   fuse,
   fuse3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.17.7";
+  version = "1.18.1";
   pname = "bindfs";
 
   src = fetchurl {
     url = "https://bindfs.org/downloads/bindfs-${finalAttrs.version}.tar.gz";
-    hash = "sha256-wLBg6Uw6IxodSqC88mb/GJmBpO845C++IylqfYFxm3o=";
+    hash = "sha256-KnBk2ZOl8lXFLXI4XvFONJwTG8RBlXZuIXNCjgbSef0=";
   };
 
+  patches = [
+    # This commit fixes macfuse support but breaks fuse support
+    # The condition to include `uint32_t position` in bindfs_setxattr and bindfs_getxattr
+    # is wrong, leading to -Wincompatible-function-pointer-types
+    # https://github.com/mpartel/bindfs/issues/169
+    (fetchpatch {
+      url = "https://github.com/mpartel/bindfs/commit/3293dc98e37eed0fb0cbfcbd40434d3c37c69480.patch";
+      hash = "sha256-dtjvSJTS81R+sksl7n1QiyssseMQXPlm+LJYZ8/CESQ=";
+      revert = true;
+    })
+  ];
+
   nativeBuildInputs = [
+    autoreconfHook
     pkg-config
   ];