summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/rustc.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/rustc.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/rustc.nix')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index fc43cfe2e26..500b63c6927 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
 , fetchurl, file, python3
-, darwin, cmake, rust, rustPlatform
+, darwin, cargo, cmake, rust, rustc, rustPlatform
 , pkg-config, openssl, xz
 , libiconv
 , which, libffi
@@ -73,8 +73,8 @@ in stdenv.mkDerivation rec {
     cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++";
   in [
     "--release-channel=stable"
-    "--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc"
-    "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo"
+    "--set=build.rustc=${rustc}/bin/rustc"
+    "--set=build.cargo=${cargo}/bin/cargo"
     "--enable-rpath"
     "--enable-vendor"
     "--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
@@ -180,7 +180,7 @@ in stdenv.mkDerivation rec {
   depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ];
 
   nativeBuildInputs = [
-    file python3 rustPlatform.rust.rustc cmake
+    file python3 rustc cmake
     which libffi removeReferencesTo pkg-config xz
   ];