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

Merge pull request #63759 from arcnmx/rust-darwin-rls 

rls: fix darwin build
This commit is contained in:
Jörg Thalheim 2019-07-29 07:22:37 +01:00 committed by GitHub
parent 9aa00bf759 40020f46b6
commit 6943c9ea91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/rust/rls/default.nix
View File

@ -5,20 +5,23 @@
rustPlatform.buildRustPackage rec {
pname = "rls";
# with rust 1.x you can only build rls version 1.x.y
version = "1.35.0";
version = "1.36.0";
src = fetchFromGitHub {
owner = "rust-lang";
repo = pname;
rev = version;
sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f";
sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn";
};
cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5";
cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin";
# a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1;
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ openssh openssl curl zlib libiconv ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
@ -29,6 +32,11 @@ rustPlatform.buildRustPackage rec {
rm tests/client.rs
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rls --version
'';
meta = with stdenv.lib; {
description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
homepage = https://github.com/rust-lang/rls/;