From 13e296bd60478d036fbc4fb7a7a7ea23011afb14 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 25 Jul 2020 12:00:00 +0000 Subject: rls: fix build fix copied from rustfmt (cherry picked from commit 2885306df06e135c4007ec1158742a9c53cdcbf1) --- nixpkgs/pkgs/development/compilers/rust/rls/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nixpkgs') diff --git a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix index 63a3c96a8f92..b603675a6f17 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix @@ -20,6 +20,11 @@ rustPlatform.buildRustPackage { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; + # As of rustc 1.45.0, these env vars are required to build rls + # (due to https://github.com/rust-lang/rust/pull/72001) + CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; + CFG_RELEASE_CHANNEL = "nightly"; + # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; -- cgit 1.4.1