mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
qt-gstreamer: fix build and do not mark wrong pkgs as broken
(cherry picked from commit f9a1060199)
This commit is contained in:
parent
47d758081e
commit
e005c15647
2 changed files with 2 additions and 3 deletions
|
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
|
||||
propagatedBuildInputs = [ boost ];
|
||||
propagatedBuildInputs = [ boost155 ];
|
||||
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
|
||||
|
||||
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue