diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-06-08 23:25:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 23:25:28 +0200 |
| commit | 68276ef258ed1f60aa84f612cbb8e8b3242b4acf (patch) | |
| tree | ea78e9874398ec2b4772172a480c1527388332e2 /pkgs/by-name/ca | |
| parent | 3300460d40a16f02c1c11cd271ef1ea116cd0f35 (diff) | |
| parent | fff1d11f45b72e25f6157fee747fd8cfbe647bfd (diff) | |
Merge pull request #318140 from bcdarwin/unbreak-castxml
castxml: unbreak binary by adding llvm to buildInputs
Diffstat (limited to 'pkgs/by-name/ca')
| -rw-r--r-- | pkgs/by-name/ca/castxml/package.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index 684d868be686e..ba76cb9a445d9 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -7,6 +7,7 @@ llvmPackages, python3, stdenv, + testers, zlib, # Boolean flags withHTML ? true, @@ -30,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - (lib.getDev llvm) ] ++ lib.optionals (withManual || withHTML) [ sphinx @@ -39,32 +39,29 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libffi libxml2 + llvm zlib ] ++ lib.optionals (!stdenv.isDarwin) [ libclang ]; 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; + }; meta = { homepage = "https://github.com/CastXML/CastXML"; |