From 2f34a740c7538900dfa04d1c05bcc3775fcfdd6c Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 13 Oct 2025 22:18:14 +0000 Subject: [PATCH] build(nix): fix build of deltachat-rpc-server-x86_64-darwin --- .github/workflows/nix.yml | 5 +++-- flake.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 33e40c155..425da3280 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -95,10 +95,11 @@ jobs: matrix: installable: - deltachat-rpc-server + - deltachat-rpc-server-x86_64-darwin - # Fails to bulid + # Fails to build + # because of . # - deltachat-rpc-server-aarch64-darwin - # - deltachat-rpc-server-x86_64-darwin steps: - uses: actions/checkout@v5 with: diff --git a/flake.nix b/flake.nix index 624e875ca..0576ee785 100644 --- a/flake.nix +++ b/flake.nix @@ -237,6 +237,9 @@ auditable = false; # Avoid cargo-auditable failures. doCheck = false; # Disable test as it requires network access. + CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib"; + CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib"; + CARGO_BUILD_TARGET = rustTarget; TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc"; CARGO_BUILD_RUSTFLAGS = [