From 2c10cef2b38af301d50603c6fb8851677854a98f Mon Sep 17 00:00:00 2001 From: Samyak S Sarnayak Date: Fri, 15 Dec 2023 20:31:01 +0530 Subject: [PATCH] rustfmt: use unwrapped rustc when adding rpath for darwin fixes nixpkgs#273920 --- pkgs/development/compilers/rust/rustfmt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 40f6237dbe98..9cc8df5a9e90 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -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