summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/clippy.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-05-12 14:17:16 +0000
committerAlyssa Ross <hi@alyssa.is>2023-05-12 15:31:21 +0000
commit5e06b3cb197047072fc25e0eb1a507bbd7bf847e (patch)
tree1468ee6a19c687929931e6b3312b54dd0811bcdd /pkgs/development/compilers/rust/clippy.nix
parentb22c35f05bee135148303428e8545aba302b5376 (diff)
downloadnixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar.gz
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar.bz2
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar.lz
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar.xz
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.tar.zst
nixpkgs-5e06b3cb197047072fc25e0eb1a507bbd7bf847e.zip
treewide: don't use rustPlatform.rust
This will be deprecated in the next commit.
Diffstat (limited to 'pkgs/development/compilers/rust/clippy.nix')
-rw-r--r--pkgs/development/compilers/rust/clippy.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix
index 018aba1f356..8459002743b 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/pkgs/development/compilers/rust/clippy.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, rustPlatform, Security, patchelf }:
+{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
 
 rustPlatform.buildRustPackage {
   pname = "clippy";
-  inherit (rustPlatform.rust.rustc) version src;
+  inherit (rustc) version src;
 
   separateDebugInfo = true;
 
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = [ rustPlatform.rust.rustc.llvm ]
+  buildInputs = [ rustc.llvm ]
     ++ lib.optionals stdenv.isDarwin [ Security ];
 
   # fixes: error: the option `Z` is only accepted on the nightly compiler
@@ -31,8 +31,8 @@ rustPlatform.buildRustPackage {
   # [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 "${rustPlatform.rust.rustc}/lib" "$out/bin/clippy-driver"
-    install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/cargo-clippy"
+    install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver"
+    install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy"
   '';
 
   meta = with lib; {