diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:40:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:40:19 +0200 |
| commit | 2ba59c0f8eed5fa23f5582ab50436aa8946c3bde (patch) | |
| tree | 3000e3a058e1471c0df8d4353d2d32ac40b5b19d /pkgs/development/libraries/gstreamer | |
| parent | e8d3c1579bf7e773270e208bc489d193cdf37243 (diff) | |
| download | nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar.gz nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar.bz2 nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar.lz nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar.xz nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.tar.zst nixpkgs-2ba59c0f8eed5fa23f5582ab50436aa8946c3bde.zip | |
Revert "gst_all_1.gst-plugins-bad: fix build after opencv4 update"
This reverts commit 1906fc5bd10a7bbab35136325fa3251a043361b2. After 18a6a778 it isn't needed anymore.
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 4 |
1 files changed, 0 insertions, 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 |