treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

This commit is contained in:
Ben Siraphob
2021-01-01 11:52:33 +07:00
parent 54ab07c1fe
commit b04fc593e7
212 changed files with 611 additions and 634 deletions
@@ -27,8 +27,8 @@ mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
buildInputs = [
cmake
elfutils
extra-cmake-modules
kconfigwidgets
@@ -50,8 +50,6 @@ mkDerivation rec {
mkdir -p 3rdparty/perfparser/.git
'';
enableParallelBuilding = true;
meta = {
description = "A GUI for Linux perf";
longDescription = ''
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f";
};
buildInputs = [ cmake boost tbb gmp clang llvm sqlite python
nativeBuildInputs = [ cmake ];
buildInputs = [ boost tbb gmp clang llvm sqlite python
ocamlPackages.apron mpfr ppl doxygen graphviz ];
cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ];
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/bin/iwyu_tool.py \
--replace "'include-what-you-use'" "'$out/bin/include-what-you-use'"
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }:
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
stdenv.mkDerivation rec {
version = "5.4.0";
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
# see https://github.com/mozilla/rr/issues/2269
preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ cmake pkg-config which ];
buildInputs = [
cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto
libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto
];
propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
cmakeFlags = [
@@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "fortify" ];
enableParallelBuilding = true;
# FIXME
#doCheck = true;