Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
730 changed files with 3908 additions and 1908 deletions

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, llvmPackages, python2 }:
{ lib, stdenv, fetchurl, cmake, llvmPackages, python3 }:
stdenv.mkDerivation rec {
pname = "include-what-you-use";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz";
};
buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm clang-unwrapped python3];
buildInputs = [ llvmPackages.libclang ];
cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];

View File

@@ -25,6 +25,6 @@ mkDerivation rec {
description = "Tool that visualizes massif data generated by valgrind";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ lethalman zraexy ];
maintainers = with maintainers; [ zraexy ];
};
}