swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270754 from kfiz/fix-dovecot-for-aarch64

Browse source
This commit is contained in:
Franz Pletz 2023-11-30 19:18:45 +01:00 committed by GitHub
parent 9b11307f42 fa2b3d0563
commit 3934dbde4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/clucene-core/2.x.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, cmake, boost, zlib}:
{lib, stdenv, fetchurl, fetchpatch, cmake, boost, zlib}:
stdenv.mkDerivation rec {
pname = "clucene-core";
@ -40,8 +40,21 @@ stdenv.mkDerivation rec {
# required for darwin and linux-musl
./pthread-include.patch
] ++ lib.optionals stdenv.isDarwin [
./fix-darwin.patch
] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
# see https://bugs.gentoo.org/869170
(fetchpatch {
url = "https://869170.bugs.gentoo.org/attachment.cgi?id=858825";
hash = "sha256-TbAfBKdXh+1HepZc8J6OhK1XGwhwBCMvO8QBDsad998=";
})
];
# see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat'
substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat'
'';
# fails with "Unable to find executable:
# /build/clucene-core-2.3.3.4/build/bin/cl_test"

3
pkgs/servers/mail/dovecot/default.nix
View file

@ -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 = [

15
pkgs/servers/mail/dovecot/timespec.patch Normal file
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -20830,9 +20830,7 @@ with pkgs;
cln = callPackage ../development/libraries/cln { };
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
clucene_core_1 = callPackage ../development/libraries/clucene-core {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;