ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-03 11:07:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86405 from lblasc/gst-plugins-bad-fix

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-05 17:53:52 +01:00 committed by GitHub
commit 18a6a7783b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -104,6 +104,8 @@ in stdenv.mkDerivation rec {
sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
})
./fix_pkgconfig_includedir.patch
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235
./opencv-4.3.patch
];
nativeBuildInputs = [

13
pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
index f38b55d..05b142e 100644
--- a/ext/opencv/meson.build
+++ b/ext/opencv/meson.build
@@ -65,7 +65,7 @@ if opencv_found
endif
endforeach
else
- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
opencv_found = opencv_dep.found()
if opencv_found
foreach h : libopencv4_headers