Commit a400318d authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Revert "openvino: use system protobuf" 

This reverts commit e1ece2c5.

This crashes the Python interpreter in the Frigate test phase, likely due
to a weird mix of protobuf versions.

Ultimately this should be reverted once we have reduce the number of
protobuf versions that transitively leak into frigate.
parent b4c7d26d

pkgs/by-name/op/openvino/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -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/"

    "-DCMAKE_PREFIX_PATH=${lib.getLib protobuf}"

    "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}"

    "-DPython_EXECUTABLE=${python.interpreter}"



    (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
@@ -142,8 +142,7 @@ stdenv.mkDerivation rec { 
    # system libs

    (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true)

    (cmakeBool "ENABLE_SYSTEM_OPENCL" true)

    (cmakeBool "ENABLE_SYSTEM_PROTOBUF" true)

    (cmakeBool "Protobuf_USE_STATIC_LIBS" false)

    (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false)

    (cmakeBool "ENABLE_SYSTEM_PUGIXML" true)

    (cmakeBool "ENABLE_SYSTEM_SNAPPY" true)

    (cmakeBool "ENABLE_SYSTEM_TBB" true)
@@ -164,7 +163,6 @@ stdenv.mkDerivation rec { 
    libxml2

    ocl-icd

    opencv

    protobuf

    pugixml

    snappy

    onetbb