Skip to content

Commit 62c003b

Browse files
authored
Revert "castxml: fix build on darwin" (#348630)
2 parents b9ffd1f + 603bd7a commit 62c003b

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,21 @@ stdenv.mkDerivation (finalAttrs: {
3232
nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ];
3333

3434
buildInputs = [
35+
libclang
3536
libffi
3637
libxml2
3738
llvm
3839
zlib
39-
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libclang ];
40+
];
4041

41-
cmakeFlags =
42-
[
43-
(lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR"
44-
"${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}"
45-
)
42+
cmakeFlags = [
43+
(lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR"
44+
"${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}"
45+
)
4646

47-
(lib.cmakeBool "SPHINX_HTML" withHTML)
48-
(lib.cmakeBool "SPHINX_MAN" withManual)
49-
]
50-
++ lib.optionals stdenv.hostPlatform.isDarwin [
51-
(lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang")
52-
];
47+
(lib.cmakeBool "SPHINX_HTML" withHTML)
48+
(lib.cmakeBool "SPHINX_MAN" withManual)
49+
];
5350

5451
doCheck = true;
5552

0 commit comments

Comments
 (0)