Unverified Commit 68276ef2 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #318140 from bcdarwin/unbreak-castxml 

castxml: unbreak binary by adding llvm to buildInputs
parents 3300460d fff1d11f

pkgs/by-name/ca/castxml/package.nix

+9 −12
Original line number Diff line number Diff line
@@ -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";