From c786bb30ef74dd598e30905b0cbdb2139a01649a Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Mon, 20 Jul 2026 10:34:53 +0200
Subject: [PATCH 1/2] stalwart_0_16: increase maxSilent timeout to 4 hours

The aarch64-linux build fails on hydra currently due to no logs being
printed for a long time:
https://hydra.nixos.org/build/337495812

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/st/stalwart_0_16/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stalwart_0_16/package.nix b/pkgs/by-name/st/stalwart_0_16/package.nix
index 675ae66a9306..e160514c967f 100644
--- a/pkgs/by-name/st/stalwart_0_16/package.nix
+++ b/pkgs/by-name/st/stalwart_0_16/package.nix
@@ -298,7 +298,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         redistributable = false;
       }
     ];
-
+    maxSilent = 14400; # 4 hours
     mainProgram = "stalwart";
     maintainers = with lib.maintainers; [
       happysalada

From 534b8e8aadef2a57f74b6978ab636ad44c618a62 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Mon, 20 Jul 2026 10:38:27 +0200
Subject: [PATCH 2/2] stalwart_0_16: use rust-jemalloc-sys instead of
 JEMALLOC_SYS_WITH_LG_PAGE

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/st/stalwart_0_16/package.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/st/stalwart_0_16/package.nix b/pkgs/by-name/st/stalwart_0_16/package.nix
index e160514c967f..5322b3046e72 100644
--- a/pkgs/by-name/st/stalwart_0_16/package.nix
+++ b/pkgs/by-name/st/stalwart_0_16/package.nix
@@ -16,6 +16,7 @@
   python3Packages,
   cacert,
   libredirect,
+  rust-jemalloc-sys,
   writeTextFile,
   withFoundationdb ? false,
   stalwartEnterprise ? false,
@@ -71,13 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ZSTD_SYS_USE_PKG_CONFIG = true;
     ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
     ROCKSDB_LIB_DIR = "${rocksdb}/lib";
-  }
-  //
-    lib.optionalAttrs
-      (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isArmv7))
-      {
-        JEMALLOC_SYS_WITH_LG_PAGE = 16;
-      };
+  };
 
   depsBuildBuild = [
     pkg-config
@@ -92,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     bzip2
     openssl
+    rust-jemalloc-sys
     sqlite
     zstd
   ]