diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-30 18:01:40 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-30 18:01:40 +0200 |
| commit | f9a10601990de8eada3470eda50f7cff8277bd0e (patch) | |
| tree | add7642e438230e5563e55841d30abe4de40f46a /pkgs/development/libraries | |
| parent | 80c916b6ced0c2adc054ef14e63b28cb2dc40b89 (diff) | |
| download | nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar.gz nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar.bz2 nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar.lz nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar.xz nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.tar.zst nixpkgs-f9a10601990de8eada3470eda50f7cff8277bd0e.zip | |
qt-gstreamer: fix build and do not mark wrong pkgs as broken
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index d298fbd7fc3..74b1417e069 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -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"; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index a2630b9343e..72068bb1f7b 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; - broken = true; }; } |