Skip to content

Commit

Permalink
build(nix): workaround nextest bug on aarch64-darwin
Browse files Browse the repository at this point in the history
`proc-macro` crate tests require additional config

See nextest-rs/nextest#267

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
  • Loading branch information
rvolosatovs committed May 31, 2023
1 parent b8fe093 commit 1562ef8
Showing 1 changed file with 29 additions and 20 deletions.
49 changes: 29 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}: {
buildInputs ? [],
depsBuildBuild ? [],
preBuild ? "",
preCheck ? "",
...
} @ args: let
cargoLock.root = readTOML ./Cargo.lock;
Expand All @@ -69,26 +69,35 @@
lockPackages = cargoLock.root.package ++ cargoLock.actors-rust.package ++ cargoLock.wasi-adapter.package;
in
with pkgsCross;
with pkgs.lib; {
cargoLockParsed =
cargoLock.root
// {
package = lockPackages;
};
with pkgs.lib;
{
cargoLockParsed =
cargoLock.root
// {
package = lockPackages;
};

buildInputs =
buildInputs
++ optionals stdenv.hostPlatform.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Security
pkgs.libiconv
];
buildInputs =
buildInputs
++ optionals stdenv.hostPlatform.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Security
pkgs.libiconv
];

depsBuildBuild =
depsBuildBuild
++ optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
libiconv
];
};
depsBuildBuild =
depsBuildBuild
++ optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
libiconv
];
}
// optionalAttrs (args ? cargoArtifacts && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) {
# See https://github.com/nextest-rs/nextest/issues/267
preCheck =
preCheck
+ ''
export DYLD_FALLBACK_LIBRARY_PATH=$(rustc --print sysroot)/lib
'';
};
};
}

0 comments on commit 1562ef8

Please sign in to comment.