summary refs log tree commit diff
path: root/pkgs/development/libraries/gstreamer
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-04-03 19:01:41 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-04-03 19:01:41 -0400
commitc6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d (patch)
tree980d0dff28c2bb2e66a8626b836fbc3722cfd6a0 /pkgs/development/libraries/gstreamer
parent92124ed660c033aa3caa467876f7bc1c6f514d77 (diff)
downloadnixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar.gz
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar.bz2
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar.lz
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar.xz
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.tar.zst
nixpkgs-c6816b8f7cb0fed9e2bf7af9c934b20bf627ed0d.zip
gst_all_1.gst-plugins-bad: fix build with neon 0.31
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index da04f0b05ed..ae5fd753132 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , meson
 , ninja
 , gettext
@@ -96,6 +97,12 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [
+    # Fix build with neon 0.31
+    # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch";
+      sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
+    })
     ./fix_pkgconfig_includedir.patch
   ];