mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
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.
This commit is contained in:
parent
bf744fe904
commit
f345c59481
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user