diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-15 18:13:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-15 18:13:27 +0000 |
commit | dfd4f1430301305a0c543f034a95aaae6e3ce09d (patch) | |
tree | e451a4f3f1defad8765a1bdcee54846f014741fd /pkgs/development/compilers/llvm/12/clang/default.nix | |
parent | 80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff) | |
parent | bc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff) | |
download | nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.gz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.bz2 nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.lz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.xz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.zst nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/llvm/12/clang/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/12/clang/default.nix | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index d90d019e6d51..ab329e3d85d7 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false }: @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "185r9rr254v75ja33nmm53j85lcnkj7bzsl18wvnd37jmz2nfxa5"; + src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2"; inherit clang-tools-extra_src; unpackPhase = '' @@ -82,11 +82,20 @@ let inherit llvm; }; - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = "https://llvm.org/"; - license = lib.licenses.ncsa; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; @@ -105,6 +114,8 @@ let doCheck = false; - meta.description = "man page for Clang ${version}"; + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; }); in self |