diff options
| author | Cole Helbling <cole.e.helbling@outlook.com> | 2020-07-21 10:28:39 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:35 +0000 |
| commit | 4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7 (patch) | |
| tree | ec83fdfed192523b3239459040f6b3341ceac02a /nixpkgs | |
| parent | f8462a0e0e018102bfd913edaafbcd2f90c83a2f (diff) | |
| download | nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar.gz nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar.bz2 nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar.lz nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar.xz nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.tar.zst nixlib-4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7.zip | |
rustfmt: fix build with rustc 1.45.0
Due to a recent change in rustc 1.45.0, rustfmt now requires two additional environment variables to be set in order to build successfully: `CFG_RELEASE` and `CFG_RELEASE_CHANNEL`. (cherry picked from commit 22fdfc7fbc3f57b117f32bb950eff40db5a632c5)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rustfmt.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix index 66a18f40ad42..eb8560ada84a 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix @@ -16,6 +16,11 @@ rustPlatform.buildRustPackage rec { # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler RUSTC_BOOTSTRAP = 1; + # 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}-nightly"; + CFG_RELEASE_CHANNEL = "nightly"; + meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt"; |