diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-07-29 07:22:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-29 07:22:37 +0100 |
commit | 6943c9ea9162abf115d1d387bb79e5d7a5114f93 (patch) | |
tree | f06fb3ac9b24ccee2fc48baa4013cc6df2208481 | |
parent | 9aa00bf759b03633edebab6eef7d0ef15fa33f55 (diff) | |
parent | 40020f46b6b64cd0de9e18dc01051a09438eb00d (diff) | |
download | nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar.gz nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar.bz2 nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar.lz nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar.xz nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.tar.zst nixlib-6943c9ea9162abf115d1d387bb79e5d7a5114f93.zip |
Merge pull request #63759 from arcnmx/rust-darwin-rls
rls: fix darwin build
-rw-r--r-- | pkgs/development/tools/rust/rls/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index 0427eadea195..454c5da71438 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -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/; |