public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt-gstreamer: fix build and do not mark wrong pkgs as broken

Browse Source
This commit is contained in:
Robin Gloster 2017-03-30 18:01:40 +02:00
parent 80c916b6ce
commit f9a1060199
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake { stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
, automoc4, flex, bison, pkgconfig }: , automoc4, flex, bison, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
propagatedBuildInputs = [ boost ]; propagatedBuildInputs = [ boost155 ];
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";

1
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
View File

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
meta = { meta = {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
broken = true;
}; };
} }