Skip to content

Commit 2f34a74

Browse files
committed
build(nix): fix build of deltachat-rpc-server-x86_64-darwin
1 parent fc81cef commit 2f34a74

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/nix.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ jobs:
9595
matrix:
9696
installable:
9797
- deltachat-rpc-server
98+
- deltachat-rpc-server-x86_64-darwin
9899

99-
# Fails to bulid
100+
# Fails to build
101+
# because of <https://github.com/NixOS/nixpkgs/issues/413910>.
100102
# - deltachat-rpc-server-aarch64-darwin
101-
# - deltachat-rpc-server-x86_64-darwin
102103
steps:
103104
- uses: actions/checkout@v5
104105
with:

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@
237237
auditable = false; # Avoid cargo-auditable failures.
238238
doCheck = false; # Disable test as it requires network access.
239239

240+
CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib";
241+
CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib";
242+
240243
CARGO_BUILD_TARGET = rustTarget;
241244
TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
242245
CARGO_BUILD_RUSTFLAGS = [

0 commit comments

Comments
 (0)