From a122884cb3709ef64c694d2658127a50dba2524b Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 2 Nov 2023 18:18:35 +0000 Subject: opencv4: cuda: add a libstdc++ integration test --- pkgs/development/libraries/opencv/4.x.nix | 5 ++++- pkgs/development/libraries/opencv/libstdcxx-test.nix | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/opencv/libstdcxx-test.nix (limited to 'pkgs/development/libraries/opencv') diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 68099a57c63..ab7eb5c3ca0 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -495,8 +495,11 @@ stdenv.mkDerivation { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; - }; }; + } + // lib.optionalAttrs (enableCuda) { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { diff --git a/pkgs/development/libraries/opencv/libstdcxx-test.nix b/pkgs/development/libraries/opencv/libstdcxx-test.nix new file mode 100644 index 00000000000..aab1101883c --- /dev/null +++ b/pkgs/development/libraries/opencv/libstdcxx-test.nix @@ -0,0 +1,17 @@ +{ python3Packages, runCommand }: + +runCommand "${python3Packages.opencv4.pname}-libstdcxx-test" +{ + nativeBuildInputs = [ + (python3Packages.python.withPackages (ps: with ps; [ + (opencv4.override { enableCuda = true; }) + scikit-image + ])) + ]; +} '' + python << EOF + import cv2 + from skimage.transform import pyramid_reduce + EOF + touch $out +'' -- cgit 1.4.1