Merge pull request #93849 from symphorien/rls-1.45

rls: fix build
This commit is contained in:
Jörg Thalheim 2020-07-25 22:37:25 +01:00 committed by GitHub
commit b150f71be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;