Skip to content
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

fix: polkadot nix build fails due to clang std=c++17 on MacOS #730

Merged
merged 2 commits into from
Feb 5, 2025
Merged

fix: polkadot nix build fails due to clang std=c++17 on MacOS #730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
396d943
fix: nix on MacOS
th7nder Feb 4, 2025
4dcd0ef
fix: make CRATE_CC_NO_DEFAULT in shell only on MacOS
th7nder Feb 5, 2025
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
21 changes: 18 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,23 @@
pkgs = import nixpkgs {
inherit system overlays;
};

rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;

# It's because on MacOS, we're using Clang and underlying dependency (wasm-opt-rs) is failing to compile.
# It fails to compile because Nix's Clang wrapper gives a warning about cross-compilation.
# CRATE_CC_NO_DEFAULTS disables `--target` flag passed to the `clang++`.
# It may have some unintended consequences, but didn't see any yet.
# - https://github.com/andresilva/polkadot.nix/issues/36
# - https://github.com/NixOS/nixpkgs/pull/323869#issuecomment-2635436334
customPolkadot = if pkgs.stdenv.isDarwin then
pkgs.polkadot.overrideAttrs (old: {
CRATE_CC_NO_DEFAULTS = "1";
})
else
pkgs.polkadot;

buildInputs = with pkgs; [
cargo-expand
cargo-tarpaulin
clang
just
Expand All @@ -31,8 +45,8 @@
subxt
taplo
jq
# Due to polkadot's flake.nix, needs to be prefixed with pkgs.polkadot
pkgs.polkadot
customPolkadot
# Due to polkadot's flake.nix, needs to be prefixed with pkgs.zombienet
pkgs.zombienet
# rust-fil-proofs OpenCL dependencies (https://github.com/filecoin-project/rust-fil-proofs/blob/5a0523ae1ddb73b415ce2fa819367c7989aaf73f/README.md?plain=1#L74)
ocl-icd
Expand All @@ -51,6 +65,7 @@
inherit buildInputs;

OPENSSL_NO_VENDOR = 1;
CRATE_CC_NO_DEFAULTS = lib.optionalString pkgs.stdenv.isDarwin "1";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
PROTOC = "${protobuf}/bin/protoc";
RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library/";
Expand Down