diff options
author | Robin Gloster <mail@glob.in> | 2016-03-01 22:44:31 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-01 22:45:37 +0000 |
commit | 995475944f4213ddef3382ed09ba2fdc10687e1d (patch) | |
tree | 1dd46296eccec0848010b8a89f2f9a2df76eb58d /pkgs/development | |
parent | f082170873afd2d168034daabce33cd3bdc08cde (diff) | |
download | nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar.gz nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar.bz2 nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar.lz nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar.xz nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.tar.zst nixlib-995475944f4213ddef3382ed09ba2fdc10687e1d.zip |
qt_gstreamer1: add upstream patch to build with current gstreamer
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index b306e737df11..3bd840dcd7ee 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake +{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { @@ -10,13 +10,20 @@ stdenv.mkDerivation rec { sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4"; }; + patches = [ + (fetchpatch { + url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088"; + sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s"; + }) + ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - meta = { + meta = { platforms = stdenv.lib.platforms.linux; }; } |