diff options
Diffstat (limited to 'pkgs/development/compilers/rust/rustfmt.nix')
-rw-r--r-- | pkgs/development/compilers/rust/rustfmt.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 1ff36e71e82..4bee49eff5a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, rustPlatform, Security, asNightly ? false }: +{ lib, stdenv, rustPlatform, rustc, Security, asNightly ? false }: rustPlatform.buildRustPackage rec { pname = "rustfmt" + lib.optionalString asNightly "-nightly"; - inherit (rustPlatform.rust.rustc) version src; + inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { dontUpdateAutotoolsGnuConfigScripts = true; buildInputs = [ - rustPlatform.rust.rustc.llvm + rustc.llvm ] ++ lib.optional stdenv.isDarwin Security; # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # As of rustc 1.45.0, these env vars are required to build rustfmt (due to # https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = rustPlatform.rust.rustc.version; + CFG_RELEASE = rustc.version; CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; meta = with lib; { |