public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89742 from lblasc/rls-std-completion-fix

Browse Source
This commit is contained in:
Jörg Thalheim 2020-06-07 21:39:00 +01:00 committed by GitHub
commit eadcec4988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/rust/rls/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform { stdenv, makeWrapper, fetchFromGitHub, rustPlatform
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv , openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, CoreFoundation, Security }: , CoreFoundation, Security }:
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
doCheck = true; doCheck = true;
@ -35,6 +35,11 @@ rustPlatform.buildRustPackage {
$out/bin/rls --version $out/bin/rls --version
''; '';
RUST_SRC_PATH = rustPlatform.rustcSrc;
postInstall = ''
wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
homepage = "https://github.com/rust-lang/rls/"; homepage = "https://github.com/rust-lang/rls/";