Skip to content

build: build for macOS with nix #8337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
link2xt wants to merge 1 commit into
base: link2xt/refactor-flake.nix
Choose a base branch
from
+12 −8
Draft

build: build for macOS with nix #8337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 11 additions & 4 deletions nix/cross-rust-package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading