diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-02-18 21:47:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 21:47:45 +0000 |
| commit | 9fee338cb975e20bacf42aa9b0fabdc7ddc2c609 (patch) | |
| tree | c27e0a2b5f024e5ae10abbf95a37d68ae4eccea7 /pkgs/development/compilers | |
| parent | 3698ce17552d256409416b99bd89d80514e82b05 (diff) | |
| parent | 502c0ee8994b13b14ac77fe3e6e559d3e215bf32 (diff) | |
| download | nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar.gz nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar.bz2 nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar.lz nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar.xz nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.tar.zst nixlib-9fee338cb975e20bacf42aa9b0fabdc7ddc2c609.zip | |
Merge pull request #80401 from cole-h/clippy
clippy: add rustc.llvm to buildInputs
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rust/clippy.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 56b70f21d4c7..4857b587847e 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise 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 RUSTC_BOOTSTRAP = 1; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { ''; 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"; maintainers = with maintainers; [ basvandijk ]; license = with licenses; [ mit asl20 ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0c26f3dffdf..7857dbc7ee6f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -155,8 +155,10 @@ in stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; + passthru.llvm = llvmShared; + meta = with stdenv.lib; { - homepage = https://www.rust-lang.org/; + homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan globin havvy ]; license = [ licenses.mit licenses.asl20 ]; |