BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustfmt: use unwrapped rustc when adding rpath for darwin

Browse source 
fixes nixpkgs#273920
This commit is contained in:
Samyak S Sarnayak 2023-12-15 20:31:01 +05:30 committed by Alyssa Ross
parent dd6cf9cf1c
commit 2c10cef2b3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/rust/rustfmt.nix
View file

@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec {
# [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543
# [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/rustfmt"
install_name_tool -add_rpath "${rustc}/lib" "$out/bin/git-rustfmt"
install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt"
install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt"
'';
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler