From 029555ec8d5802df415d530aa5a8962d5354f918 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <2012gdwu+github@posteo.de>
Date: Thu, 17 Oct 2024 23:24:22 +0200
Subject: [PATCH] opencv4: restore sfm module

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/opencv/4.x.nix   | 10 ++++++++--
 pkgs/development/libraries/opencv/tests.nix |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 0a48e4da8563..e05c1f65dd12 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -10,6 +10,7 @@
 , hdf5
 , boost
 , glib
+, glog
 , gflags
 , protobuf_21
 , config
@@ -305,6 +306,7 @@ effectiveStdenv.mkDerivation {
     boost
     gflags
     glib
+    glog
     pcre2
     protobuf_21
     zlib
@@ -397,11 +399,13 @@ effectiveStdenv.mkDerivation {
     cmake
     pkg-config
     unzip
-  ] ++ optionals enablePython [
+  ] ++ optionals enablePython ([
     pythonPackages.pip
     pythonPackages.wheel
     pythonPackages.setuptools
-  ] ++ optionals enableCuda [
+  ] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
+    pythonPackages.pythonImportsCheckHook
+  ]) ++ optionals enableCuda [
     cudaPackages.cuda_nvcc
   ];
 
@@ -545,6 +549,8 @@ effectiveStdenv.mkDerivation {
     popd
   '';
 
+  pythonImportsCheck = [ "cv2" "cv2.sfm" ];
+
   passthru = {
     cudaSupport = enableCuda;
 
diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix
index dec10c1b13ab..a06d7994794f 100644
--- a/pkgs/development/libraries/opencv/tests.nix
+++ b/pkgs/development/libraries/opencv/tests.nix
@@ -49,8 +49,9 @@ let
     export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata"
     export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data"
 
-    #ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11"
-    export GTEST_FILTER="-AsyncAPICancelation/cancel*"
+    # ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11"
+    # ignore test due to numerical instability
+    export GTEST_FILTER="-AsyncAPICancelation/cancel*:Photo_CalibrateDebevec.regression"
   '';
   accuracyTests = lib.optionalString runAccuracyTests ''
     ${ builtins.concatStringsSep "\n"