diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2020-07-25 12:00:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:38 +0000 |
| commit | 13e296bd60478d036fbc4fb7a7a7ea23011afb14 (patch) | |
| tree | e93ef73150f9178068b823d4ad97e4725361b629 /nixpkgs | |
| parent | 73fb487dbdf032551e7ac79e067365a8aba60540 (diff) | |
| download | nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar.gz nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar.bz2 nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar.lz nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar.xz nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.tar.zst nixlib-13e296bd60478d036fbc4fb7a7a7ea23011afb14.zip | |
rls: fix build
fix copied from rustfmt (cherry picked from commit 2885306df06e135c4007ec1158742a9c53cdcbf1)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rls/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
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; |