Fix SYSROOT detection on latest nightly

mozilla / nixpkgs-mozilla

Mozilla overlay for Nixpkgs.

MIT License

516 stars 128 forks source link

Fix SYSROOT detection on latest nightly #299

Closed bkchr closed 1 year ago

bkchr commented 1 year ago

Rust changed the way the SYSROOT is determined in: https://github.com/rust-lang/rust/pull/103660

Before this change the SYSROOT was determined based on the rustc executable. Now it is determined based on the librustc_driver-*.so file. This pr fixes the detection by copying the library to the derivation as we have done it for the rustc executable.

bkchr commented 1 year ago

CC @nbp

andersk commented 1 year ago

Something different may be needed for Darwin?

For reference, corresponding changes from other Rust overlays:

https://github.com/nix-community/fenix/pull/91
https://github.com/oxalica/rust-overlay/commit/be3a8a8b59aaec5cd96d3ea6e4470bd14bdd8b37
https://github.com/oxalica/rust-overlay/issues/110

bkchr commented 1 year ago

Something different may be needed for Darwin?

Good question. I don't have any nix installation on Mac OS. Can you test this?

nbp commented 1 year ago

Thanks for making these changes! You are the best.