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.

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

nix: fix build on macOS #3136

Merged
merged 3 commits into from
Feb 28, 2024
Merged

nix: fix build on macOS #3136

merged 3 commits into from
Feb 28, 2024

Conversation

thoughtpolice
Copy link
Contributor

@thoughtpolice thoughtpolice commented Feb 25, 2024

The jj-proc-macros crate caused the nix-on-macOS build to regress, due to nextest-rs/nextest#267. Work around this, and add nix-on-macOS to the CI matrix.

Closes #3161.

This naming is just more consistent with the surrounding code.

Signed-off-by: Austin Seipp <[email protected]>
When the `jj-proc-macros` crate was introduced, it triggered an underlying
bug in `nextest`, which is the test harness we use in the Nix build. This is
upstream Nextest bug 267. The long and short of it is that `rustc` fails to
find needed libraries whenever the proc macros are loaded.

This can easily be worked around however, by setting
`DYLD_FALLBACK_LIBRARY_PATH` to an appropriate value in the devShell and in the
`preCheck` phase of the main expression.

Signed-off-by: Austin Seipp <[email protected]>
@thoughtpolice thoughtpolice force-pushed the aseipp/push-yvssuxnmunyo branch from 176b462 to 38df4ce Compare February 25, 2024 00:30
The aarch64-darwin macOS runners are actually quite speedy, often the fastest
builders anyway. With the recent improvements to the Nix CI speed in 3f7b5a7,
this shouldn't be a bottleneck, and will catch build regressions.
@martinvonz martinvonz merged commit e8f01ce into main Feb 28, 2024
16 checks passed
@martinvonz martinvonz deleted the aseipp/push-yvssuxnmunyo branch February 28, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

nix run: Cannot execute latest prerelease version of jj
3 participants