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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-19 00:41:01 +00:00
committed by GitHub
parent 8497314b8e aea8bbde8d
commit d73a492e83
91 changed files with 1170 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, callPackage }:
{ pkgs, callPackage, CoreServices }:
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
@@ -6,6 +6,8 @@
version = "unstable-${rev}";
sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf";
cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2";
inherit CoreServices;
};
rust-analyzer = callPackage ./wrapper.nix {} {

9
pkgs/development/tools/rust/rust-analyzer/generic.nix
View File

@@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
, libiconv
, useMimalloc ? false
, doCheck ? true
@@ -22,8 +23,10 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = lib.optional useMimalloc cmake;
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin
[ darwin.apple_sdk.frameworks.CoreServices ];
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices
libiconv
];
RUST_ANALYZER_REV = rev;