diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2023-11-30 19:18:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-30 19:18:45 +0100 |
commit | 3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3 (patch) | |
tree | d1919312baf57ad76ecd8e9c28dc82e1f54e39c6 /pkgs/servers/mail | |
parent | 9b11307f42bb14d8f3ba50eb8bd80ab7dbbbec9f (diff) | |
parent | fa2b3d0563b2052a152bf3525e566c5dfdc96980 (diff) | |
download | nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar.gz nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar.bz2 nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar.lz nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar.xz nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.tar.zst nixlib-3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3.zip |
Merge pull request #270754 from kfiz/fix-dovecot-for-aarch64
Diffstat (limited to 'pkgs/servers/mail')
-rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/timespec.patch | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 133411ffc737..04c1f7031bba 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch"; hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # fix timespec calls + ./timespec.patch ]; configureFlags = [ diff --git a/pkgs/servers/mail/dovecot/timespec.patch b/pkgs/servers/mail/dovecot/timespec.patch new file mode 100644 index 000000000000..50290a5a57de --- /dev/null +++ b/pkgs/servers/mail/dovecot/timespec.patch @@ -0,0 +1,15 @@ +diff --git a/src/lib-storage/index/dbox-common/dbox-storage.h b/src/lib-storage/index/dbox-common/dbox-storage.h +index 8e8aaa1..a3018a4 100644 +--- a/src/lib-storage/index/dbox-common/dbox-storage.h ++++ b/src/lib-storage/index/dbox-common/dbox-storage.h +@@ -86,4 +86,10 @@ int dbox_verify_alt_storage(struct mailbox_list *list); + bool dbox_header_have_flag(struct mailbox *box, uint32_t ext_id, + unsigned int flags_offset, uint8_t flag); + ++#if defined(__APPLE__) || defined(__NetBSD__) ++#define st_atim st_atimespec ++#define st_ctim st_ctimespec ++#define st_mtim st_mtimespec ++#endif ++ + #endif |