From 09b61573f1d5e96532a7acd9fbd85b27c2f77654 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Dec 2024 17:47:33 +0100 Subject: [PATCH] openvino: return to default stdenv, upgrade to tbb_2022_0 --- pkgs/by-name/op/openvino/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 7641287ebfff..dcbf5f65af0d 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -1,5 +1,5 @@ { lib -, gcc12Stdenv +, stdenv , fetchFromGitHub , fetchurl , cudaSupport ? opencv.cudaSupport or false @@ -27,7 +27,7 @@ , protobuf , pugixml , snappy -, tbb_2021_5 +, tbb_2022_0 , cudaPackages }: @@ -36,8 +36,6 @@ let cmakeBool ; - stdenv = gcc12Stdenv; - # prevent scons from leaking in the default python version scons' = scons.override { inherit python3Packages; }; @@ -153,7 +151,7 @@ stdenv.mkDerivation rec { opencv.cxxdev pugixml snappy - tbb_2021_5 + tbb_2022_0 ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];