diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/rust/rls/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rls/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix index 06b1b9b1e648..ee860d782580 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rls/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rls/default.nix @@ -1,5 +1,5 @@ -{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform +, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); + ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; @@ -39,12 +39,12 @@ rustPlatform.buildRustPackage { $out/bin/rls --version ''; - RUST_SRC_PATH = rustPlatform.rustcSrc; + RUST_SRC_PATH = rustPlatform.rustLibSrc; postInstall = '' - wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = "https://github.com/rust-lang/rls/"; license = with licenses; [ asl20 /* or */ mit ]; |