From e1ece2c5218fa3141ee7bef86f16710640c10d4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Nov 2025 20:31:00 +0100 Subject: [PATCH 1/2] openvino: use system protobuf --- pkgs/by-name/op/openvino/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 81c9db239ab9..790280f76741 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-DOpenCV_DIR=${lib.getLib opencv}/lib/cmake/opencv4/" - "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DCMAKE_PREFIX_PATH=${lib.getLib protobuf}" "-DPython_EXECUTABLE=${python.interpreter}" (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) @@ -142,7 +142,8 @@ stdenv.mkDerivation rec { # system libs (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true) (cmakeBool "ENABLE_SYSTEM_OPENCL" true) - (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false) + (cmakeBool "ENABLE_SYSTEM_PROTOBUF" true) + (cmakeBool "Protobuf_USE_STATIC_LIBS" false) (cmakeBool "ENABLE_SYSTEM_PUGIXML" true) (cmakeBool "ENABLE_SYSTEM_SNAPPY" true) (cmakeBool "ENABLE_SYSTEM_TBB" true) @@ -163,6 +164,7 @@ stdenv.mkDerivation rec { libxml2 ocl-icd opencv + protobuf pugixml snappy onetbb From 5889b352a42a8630a34342fc51c29e58fe616498 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Nov 2025 22:23:08 +0100 Subject: [PATCH 2/2] openvino: 2025.2.0 -> 2025.2.1 https://github.com/openvinotoolkit/openvino/releases/tag/2025.2.1 --- pkgs/by-name/op/openvino/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 790280f76741..6e949aee72a6 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2025.2.0"; + version = "2025.2.1"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-EtXHMOIk4hGcLiaoC0ZWYF6XZCD2qNtt1HeJoJIuuTA="; + hash = "sha256-Bu0m7nGqyHwHsa7FKr4nvUh/poJxMTgwuAU81QBmI4g="; }; patches = [