From d3eda58a2d9188020b78772e28138bdcd4d9927a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 20 Mar 2023 18:48:53 +0200 Subject: [PATCH] cppcheck: enable strictDeps fixes cross checked with diffing --- .../tools/analysis/cppcheck/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index b1d7813a3df0..c1a79672f9ad 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -8,6 +8,7 @@ , docbook_xsl , docbook_xml_dtd_45 , which +, pkg-config }: stdenv.mkDerivation rec { @@ -21,8 +22,9 @@ stdenv.mkDerivation rec { hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which python3 ]; buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; - nativeBuildInputs = [ installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which ]; makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; @@ -30,17 +32,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + substituteInPlace Makefile \ + --replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre' + ''; + postBuild = '' make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man ''; - # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); - postInstall = '' installManPage cppcheck.1 ''; + # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck