diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-11-15 00:06:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 00:06:06 +0100 |
| commit | 07adfe6112b02bc477beda09f293472808f8e73c (patch) | |
| tree | a642f07c52b39680b76849de39b4f7d1defbe65c /pkgs | |
| parent | 7a6a55e49901f1dc222ed50812f518108a86ad19 (diff) | |
| parent | f345c59481bcb66d61adf7dabbcd46fb34960a64 (diff) | |
Merge pull request #267446 from mweinelt/frigate-opencv-relax
frigate: drop opencv pin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/frigate/default.nix | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 42d5b281bbea2..5414193640f0e 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 |