{python{313,314}Packages.pikepdf,poppler}: fix build with Clang (#538398)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
cairo,
|
||||
clang-tools,
|
||||
cmake,
|
||||
boost,
|
||||
curl,
|
||||
@@ -81,6 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals (!minimal) [
|
||||
glib # for glib-mkenums
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
# Pick up the `clang-scan-deps` wrapper for CMake; see:
|
||||
#
|
||||
# * <https://github.com/NixOS/nixpkgs/issues/452260>
|
||||
# * <https://github.com/NixOS/nixpkgs/pull/514323>
|
||||
clang-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
attrs,
|
||||
buildPythonPackage,
|
||||
clang-tools,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
hypothesis,
|
||||
@@ -63,6 +65,13 @@ buildPythonPackage rec {
|
||||
nanobind
|
||||
ninja
|
||||
scikit-build-core
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
# Pick up the `clang-scan-deps` wrapper for CMake; see:
|
||||
#
|
||||
# * <https://github.com/NixOS/nixpkgs/issues/452260>
|
||||
# * <https://github.com/NixOS/nixpkgs/pull/514323>
|
||||
clang-tools
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
Reference in New Issue
Block a user