From a28796b8c053def7c3f839d43ca2df76d4d86bb1 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:18:53 +0000 Subject: [PATCH] Revert "castxml: fix build on darwin" workaround for clang is no longer needed after change 8c9c8ade2f88a85ccdd4858cc802d7b7d6c48fe0 fixed cmake This reverts commit 94490fd53141d1be123d2ca0dfe1fdac0487a2da. --- pkgs/by-name/ca/castxml/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index c0fe17a1d097..958f237a88c8 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -32,11 +32,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ]; buildInputs = [ + libclang libffi libxml2 llvm zlib - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libclang ]; + ]; cmakeFlags = [ @@ -46,9 +47,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; doCheck = true;