From f345c59481bcb66d61adf7dabbcd46fb34960a64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Nov 2023 13:58:19 +0100 Subject: [PATCH] frigate: drop opencv pin Started failing when opencv was replaced by opencv4 and caused a conflict in the python environment due to multiple instances of the same library being present. --- pkgs/applications/video/frigate/default.nix | 25 +-------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 42d5b281bbea..5414193640f0 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -5,7 +5,6 @@ , fetchurl , fetchpatch , frigate -, opencv4 , nixosTests }: @@ -26,28 +25,6 @@ let python = python3.override { packageOverrides = self: super: { - # https://github.com/blakeblackshear/frigate/blob/v0.12.0/requirements-wheels.txt#L7 - opencv = super.toPythonModule ((opencv4.override { - enablePython = true; - pythonPackages = self; - }).overrideAttrs (oldAttrs: rec { - version = "4.5.5"; - src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv"; - rev = "refs/tags/${version}"; - hash = "sha256-TJfzEAMh4JSshZ7oEZPgB59+NBACsj6Z5TCzVOBaEP4="; - }; - contribSrc = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_contrib"; - rev = "refs/tags/${version}"; - hash = "sha256-skuH9GYg0mivGaJjxbggXk4x/0bbQISrAawA3ZUGfCk="; - }; - postUnpack = '' - cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" - ''; - })); }; }; @@ -129,7 +106,7 @@ python.pkgs.buildPythonApplication rec { imutils matplotlib numpy - opencv + opencv4 openvino paho-mqtt peewee