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

Merge pull request #53351 from Mic92/clang-tools

Browse Source 
clang-tools: 5 -> 7
This commit is contained in:
Jörg Thalheim 2019-01-04 13:49:06 +01:00 committed by GitHub
commit e3bc81f531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/clang-tools/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, makeWrapper, writeScript, llvmPackages }: { stdenv, writeScript, llvmPackages_latest }:
let let
clang = llvmPackages.clang-unwrapped; clang = llvmPackages_latest.clang-unwrapped;
version = stdenv.lib.getVersion clang; version = stdenv.lib.getVersion clang;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "clang-tools-${version}"; name = "clang-tools-${version}";
builder = writeScript "builder" '' unpackPhase = ":";
source $stdenv/setup installPhase = ''
mkdir -p $out/bin
for tool in \ for tool in \
clang-apply-replacements \ clang-apply-replacements \
clang-check \ clang-check \
@ -16,11 +17,9 @@ stdenv.mkDerivation {
clang-rename \ clang-rename \
clang-tidy clang-tidy
do do
makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool ln -s ${clang}/bin/$tool $out/bin/$tool
done done
''; '';
buildInputs = [ makeWrapper ];
inherit clang;
meta = clang.meta // { meta = clang.meta // {
description = "Standalone command line tools for C++ development"; description = "Standalone command line tools for C++ development";
maintainers = with stdenv.lib.maintainers; [ aherrmann ]; maintainers = with stdenv.lib.maintainers; [ aherrmann ];

2
pkgs/top-level/all-packages.nix
View File

@ -7351,6 +7351,8 @@ in
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_latest = llvmPackages_7;
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
mercury = callPackage ../development/compilers/mercury { }; mercury = callPackage ../development/compilers/mercury { };