diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
| commit | c46eae0f3572fbe7af42e5d40648b7b4a1d1317b (patch) | |
| tree | 84e748e6477734c4826b4d6b34152b1958e5627a /pkgs/applications/video/frigate/default.nix | |
| parent | 9297b620bb86624e6cf4b6ae54fc4ae1da98bb83 (diff) | |
| parent | e8ad54f562b4621c7c080b4a3ddbafe4735bcb86 (diff) | |
| download | nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.gz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.bz2 nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.lz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.xz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.zst nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video/frigate/default.nix')
| -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 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 |