diff options
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 1ef03420ced..5c0cf10fbc9 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -68,6 +68,7 @@ in patches = rustcPatches; # Use boot package set to break cycle + inherit (bootstrapRustPackages) cargo rustc; rustPlatform = bootRustPlatform; } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { stdenv = llvmBootstrapForDarwin.stdenv; @@ -75,7 +76,10 @@ in pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; }); - rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; + rustfmt = self.callPackage ./rustfmt.nix { + inherit Security; + inherit (self.buildRustPackages) rustc; + }; cargo = self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; @@ -83,7 +87,7 @@ in }; cargo-auditable = self.callPackage ./cargo-auditable.nix { }; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; - clippy = callPackage ./clippy.nix { + clippy = self.callPackage ./clippy.nix { # We want to use self, not buildRustPackages, so that # buildPackages.clippy uses the cross compiler and supports # linting for the target platform. |