Merge pull request #222227 from Artturin/crossfixes5

authored by

Artturi and committed by
GitHub
0fc009e2 ef51ad55

+11 -4
+11 -4
pkgs/development/tools/analysis/cppcheck/default.nix
··· 8 , docbook_xsl 9 , docbook_xml_dtd_45 10 , which 11 }: 12 13 stdenv.mkDerivation rec { ··· 21 hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA="; 22 }; 23 24 buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; 25 - nativeBuildInputs = [ installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which ]; 26 27 makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; 28 ··· 30 31 enableParallelBuilding = true; 32 33 postBuild = '' 34 make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man 35 ''; 36 - 37 - # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. 38 - doCheck = !(stdenv.isLinux && stdenv.isAarch64); 39 40 postInstall = '' 41 installManPage cppcheck.1 42 ''; 43 44 doInstallCheck = true; 45 installCheckPhase = ''
··· 8 , docbook_xsl 9 , docbook_xml_dtd_45 10 , which 11 + , pkg-config 12 }: 13 14 stdenv.mkDerivation rec { ··· 22 hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA="; 23 }; 24 25 + strictDeps = true; 26 + nativeBuildInputs = [ pkg-config installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which python3 ]; 27 buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; 28 29 makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; 30 ··· 32 33 enableParallelBuilding = true; 34 35 + postPatch = '' 36 + substituteInPlace Makefile \ 37 + --replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre' 38 + ''; 39 + 40 postBuild = '' 41 make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man 42 ''; 43 44 postInstall = '' 45 installManPage cppcheck.1 46 ''; 47 + 48 + # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. 49 + doCheck = !(stdenv.isLinux && stdenv.isAarch64); 50 51 doInstallCheck = true; 52 installCheckPhase = ''