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

Merge pull request #80401 from cole-h/clippy

Browse Source 
clippy: add rustc.llvm to buildInputs
This commit is contained in:
Jörg Thalheim 2020-02-18 21:47:45 +00:00 committed by GitHub
commit 9fee338cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/rust/clippy.nix
View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise # changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true; dontUpdateAutotoolsGnuConfigScripts = true;
buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
# fixes: error: the option `Z` is only accepted on the nightly compiler # fixes: error: the option `Z` is only accepted on the nightly compiler
RUSTC_BOOTSTRAP = 1; RUSTC_BOOTSTRAP = 1;
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://rust-lang.github.io/rust-clippy/; homepage = "https://rust-lang.github.io/rust-clippy/";
description = "A bunch of lints to catch common mistakes and improve your Rust code"; description = "A bunch of lints to catch common mistakes and improve your Rust code";
maintainers = with maintainers; [ basvandijk ]; maintainers = with maintainers; [ basvandijk ];
license = with licenses; [ mit asl20 ]; license = with licenses; [ mit asl20 ];

4
pkgs/development/compilers/rust/rustc.nix
View File

@ -155,8 +155,10 @@ in stdenv.mkDerivation rec {
requiredSystemFeatures = [ "big-parallel" ]; requiredSystemFeatures = [ "big-parallel" ];
passthru.llvm = llvmShared;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.rust-lang.org/; homepage = "https://www.rust-lang.org/";
description = "A safe, concurrent, practical language"; description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan globin havvy ]; maintainers = with maintainers; [ madjar cstrahan globin havvy ];
license = [ licenses.mit licenses.asl20 ]; license = [ licenses.mit licenses.asl20 ];