dovecot_pigeonhole_2_4: fix build
This commit is contained in:
@@ -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";
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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;
|
||||
Reference in New Issue
Block a user