Merge pull request #723 from Smaug123/more-overrides

Overrides: ftfy, shortuuid, contourpy, omegaconf, opencv-python-headless
This commit is contained in:
adisbladis 2022-09-30 04:26:48 +13:00 committed by GitHub
commit 420107e7e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 3 deletions

View file

@ -442,6 +442,9 @@
"frozenlist": [
"cython"
],
"ftfy": [
"poetry"
],
"funcparserlib": [
"poetry-core"
],
@ -1562,6 +1565,9 @@
"shexjsg": [
"pbr"
],
"shortuuid": [
"poetry"
],
"simplisafe-python": [
"poetry-core"
],

View file

@ -277,6 +277,12 @@ lib.composeManyExtensions [
)
);
contourpy = super.contourpy.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ];
}
);
cloudflare = super.cloudflare.overridePythonAttrs (
old: {
postPatch = ''
@ -1235,6 +1241,12 @@ lib.composeManyExtensions [
}
);
omegaconf = super.omegaconf.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.jdk ];
}
);
open3d = super.open3d.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ (with pkgs; [
udev
@ -1243,13 +1255,16 @@ lib.composeManyExtensions [
autoPatchelfIgnoreMissingDeps = true;
});
opencv-python = super.opencv-python.overridePythonAttrs (
_opencv-python-override =
old: {
nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
buildInputs = [ self.scikit-build ] ++ (old.buildInputs or [ ]);
dontUseCmakeConfigure = true;
}
);
};
opencv-python = super.opencv-python.overridePythonAttrs self._opencv-python-override;
opencv-python-headless = super.opencv-python.overridePythonAttrs self._opencv-python-override;
opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs (
old: {