diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-12 15:18:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-12 15:18:34 -0400 |
commit | 0588d2d9de3fd8e16993ec4ebf882849db47f375 (patch) | |
tree | c95acd3c2cfc0880d674870c097bb7743b9a42d3 /pkgs | |
parent | 31ff9f5d416b02cfce8e72b0be1780a3851e2d7d (diff) | |
parent | dc5d1aa4747dbc35f733c599154a5591264ddee5 (diff) |
Merge pull request #68605 from worldofpeace/patch-gstreamer-vaapi
gst_all_1.gst-vaapi: patch to Remove Mesa from drivers white list
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/gstreamer/vaapi/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 7e64636d96d3..adb495689e33 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland , libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm -, libvpx, python +, libvpx, python, fetchpatch }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf"; }; + patches = [ + # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html + # Note that the patch has now been actually accepted upstream. + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch"; + sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; @@ -28,8 +37,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; |