From 6c4395f7b0a16f0866cff24f959928793fbea194 Mon Sep 17 00:00:00 2001
From: Smaug123 <patrick+github@patrickstevens.co.uk>
Date: Sun, 25 Sep 2022 15:01:06 +0100
Subject: [PATCH] Update overrides for ftfy, shortuuid, contourpy, omegaconf,
 opencv-python-headless

---
 overrides/build-systems.json |  6 ++++++
 overrides/default.nix        | 21 ++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index 1ce6ac3..f9baed3 100644
--- a/overrides/build-systems.json
+++ b/overrides/build-systems.json
@@ -435,6 +435,9 @@
   "frozenlist": [
     "cython"
   ],
+  "ftfy": [
+    "poetry"
+  ],
   "funcparserlib": [
     "poetry-core"
   ],
@@ -1552,6 +1555,9 @@
   "shexjsg": [
     "pbr"
   ],
+  "shortuuid": [
+    "poetry"
+  ],
   "simplisafe-python": [
     "poetry-core"
   ],
diff --git a/overrides/default.nix b/overrides/default.nix
index a31ac01..66acd82 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -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: {