From b0990719a62369bb68925bcc5a83e3201ced36d6 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Mon, 15 Jun 2026 22:43:30 +0200
Subject: [PATCH] build: build for macOS with nix

Closes https://github.com/chatmail/core/issues/6095
---
 .github/workflows/nix.yml  |  5 +----
 nix/cross-rust-package.nix | 15 +++++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index e6ad11d6c8..3e0a8875c8 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -95,10 +95,7 @@ jobs:
         installable:
           - deltachat-rpc-server
           - deltachat-rpc-server-x86_64-darwin
-
-          # Fails to build
-          # because of <https://github.com/NixOS/nixpkgs/issues/413910>.
-          # - deltachat-rpc-server-aarch64-darwin
+          - deltachat-rpc-server-aarch64-darwin
     steps:
       - uses: actions/checkout@v6
         with:
diff --git a/nix/cross-rust-package.nix b/nix/cross-rust-package.nix
index d995d2e06c..4beb3cafd1 100644
--- a/nix/cross-rust-package.nix
+++ b/nix/cross-rust-package.nix
@@ -2,10 +2,17 @@
 arch: packageName:
 let
   crossTarget = arch2targets."${arch}";
-  pkgsCross = import nixpkgs {
-    system = system;
-    crossSystem.config = crossTarget;
-  };
+  pkgsCross =
+    if system == crossSystem then
+      import nixpkgs
+        {
+          inherit system;
+        };
+    else
+      import nixpkgs {
+        inherit system;
+        crossSystem.config = crossTarget;
+      };
   rustTarget = pkgsCross.stdenv.hostPlatform.rust.rustcTarget;
   toolchain = fenixPkgs.combine [
     fenixPkgs.stable.rustc