From 5c91cd7ca056152251e7b6bbc53ae6dcaa597714 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 28 Mar 2026 09:50:20 +0800
Subject: [PATCH] dovecot_pigeonhole_2_4: fix build

---
 pkgs/by-name/do/dovecot_pigeonhole/2.4.nix            |  1 -
 pkgs/by-name/do/dovecot_pigeonhole/generic.nix        |  9 ++++++++-
 .../do/dovecot_pigeonhole/max_lookup_size.patch       | 11 -----------
 3 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch

diff --git a/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix b/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix
index ad4da21371fc..ca18eaa2d271 100644
--- a/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix
@@ -8,7 +8,6 @@ import ./generic.nix {
     "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-pigeonhole-${version}.tar.gz";
   hash = "sha256-LQNhqYnBVICabluj8F07UOZR5frt6bd9JSyuHJDS6hc=";
   patches = fetchpatch: [
-    ./max_lookup_size.patch
     # https://github.com/NixOS/nixpkgs/pull/388463#issuecomment-3066016707
     (fetchpatch {
       url = "https://github.com/dovecot/pigeonhole/commit/517d74aa1d98b853b72608ce722bc58009c0f4a9.patch";
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
index 5ae28acac1ce..5f11b695efa1 100644
--- a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
@@ -14,6 +14,7 @@
   openssl,
   libstemmer,
   perl,
+  python3,
   withLDAP ? true,
   cyrus_sasl,
   openldap,
@@ -68,10 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional withLDAP "--with-ldap";
 
-  preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) ''
+  preBuild = lib.optionalString (!isCurrent && stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
   '';
 
+  # https://github.com/dovecot/pigeonhole/blob/2.4.3/src/plugins/settings/Makefile.am#L43-L44
+  makeFlags = lib.optionals isCurrent [
+    "PYTHON=${python3.pythonOnBuildForHost.interpreter}"
+    "SETTINGS_HISTORY_PY=${dovecot}/libexec/dovecot/settings-history.py"
+  ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch b/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch
deleted file mode 100644
index e1168a8f400c..000000000000
--- a/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
-+++ b/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
-@@ -12,7 +12,7 @@
- 
- 	const char *name;
- 	/* Maximum size of lookup value */
--	size_t max_lookup_size;
-+	uoff_t max_lookup_size;
- 
- 	struct {
- 		const char *name;