From c7dbb3ccc9795a85f9bda642f783754deae7c111 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Thu, 2 Nov 2023 18:35:26 +0000
Subject: [PATCH] opencv3: cuda: add a libstdc++ integration test

---
 pkgs/development/libraries/opencv/3.x.nix            |  7 ++++++-
 pkgs/development/libraries/opencv/4.x.nix            |  2 +-
 pkgs/development/libraries/opencv/libstdcxx-test.nix | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 037192d871e7..33bb5bfae26d 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,6 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , fetchpatch
+, callPackage
 , cmake, pkg-config, unzip, zlib, pcre, hdf5
 , glog, boost, gflags, protobuf3_21
 , config
@@ -289,7 +290,11 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "bindnow" "relro" ];
 
-  passthru = lib.optionalAttrs enablePython { pythonPath = []; };
+  passthru = lib.optionalAttrs enablePython { pythonPath = []; } // {
+    tests = lib.optionalAttrs enableCuda {
+      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv3"; };
+    };
+  };
 
   meta = with lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 87b116f92eb0..21fcfc432d78 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -495,7 +495,7 @@ effectiveStdenv.mkDerivation {
       };
     }
     // lib.optionalAttrs (enableCuda) {
-      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { };
+      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
     };
   } // lib.optionalAttrs enablePython { pythonPath = [ ]; };
 
diff --git a/pkgs/development/libraries/opencv/libstdcxx-test.nix b/pkgs/development/libraries/opencv/libstdcxx-test.nix
index aab1101883c2..d8cc483da9a8 100644
--- a/pkgs/development/libraries/opencv/libstdcxx-test.nix
+++ b/pkgs/development/libraries/opencv/libstdcxx-test.nix
@@ -1,11 +1,11 @@
-{ python3Packages, runCommand }:
+{ python3Packages, runCommand, attrName }:
 
-runCommand "${python3Packages.opencv4.pname}-libstdcxx-test"
+runCommand "${python3Packages.${attrName}.name}-libstdcxx-test"
 {
   nativeBuildInputs = [
-    (python3Packages.python.withPackages (ps: with ps; [
-      (opencv4.override { enableCuda = true; })
-      scikit-image
+    (python3Packages.python.withPackages (ps: [
+      (ps.${attrName}.override { enableCuda = true; })
+      ps.scikit-image
     ]))
   ];
 } ''