From fff1d11f45b72e25f6157fee747fd8cfbe647bfd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 8 Jun 2024 00:02:56 -0400 Subject: [PATCH] castxml: fix CLANG_RESOURCE_DIR; enable tests --- pkgs/by-name/ca/castxml/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index 35ba5dbac31a..ba76cb9a445d 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -46,27 +46,19 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}") + (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" + "${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}") + (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; - # 97% tests passed, 97 tests failed out of 2881 - # mostly because it checks command line and nix append -isystem and all - doCheck = false; + doCheck = true; strictDeps = true; - # -E exclude 4 tests based on names - # see https://github.com/CastXML/CastXML/issues/90 - checkPhase = '' - runHook preCheck - ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd' - runHook postCheck - ''; - passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; };