From 2ba59c0f8eed5fa23f5582ab50436aa8946c3bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 May 2020 08:40:19 +0200 Subject: [PATCH] Revert "gst_all_1.gst-plugins-bad: fix build after opencv4 update" This reverts commit 1906fc5bd10a7bbab35136325fa3251a043361b2. After 18a6a778 it isn't needed anymore. --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index f08718b970c..903ca661486 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -108,10 +108,6 @@ in stdenv.mkDerivation rec { ./opencv-4.3.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