From 1906fc5bd10a7bbab35136325fa3251a043361b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 May 2020 07:39:10 +0200 Subject: [PATCH] gst_all_1.gst-plugins-bad: fix build after opencv4 update /cc #85879 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d9bf86e0cf3f..5bf3e0261e4d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -106,6 +106,10 @@ in stdenv.mkDerivation rec { ./fix_pkgconfig_includedir.patch ]; + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/950 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 + postPatch = "sed '/^ opencv_dep =/s/< 4\.2\.0/< 4.4.0/' -i ext/opencv/meson.build"; + nativeBuildInputs = [ meson ninja