From 22fdfc7fbc3f57b117f32bb950eff40db5a632c5 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Tue, 21 Jul 2020 10:28:39 -0700 Subject: [PATCH] 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`. --- pkgs/development/compilers/rust/rustfmt.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 66a18f40ad42..eb8560ada84a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/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";