From 044361ec189a9957145dd8b1852222df7e06732b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Mar 2012 19:35:46 +0000 Subject: [PATCH] Pass qt_gstreamer to ktp-call-ui svn path=/nixpkgs/trunk/; revision=33080 --- .../networking/instant-messengers/telepathy/kde/default.nix | 5 +++-- .../development/libraries/gstreamer/qt-gstreamer/default.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 36d73f78323b..8b7c9ba98de0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, gettext, pkgconfig }: +{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, gettext, pkgconfig +, qt_gstreamer }: let version = "0.3.0"; @@ -38,7 +39,7 @@ let sha256 = "0yv386rqy4vkwmd38wvvsrbam59sbv5k2lwimv96kf93xgkp5g0l"; }; - buildInputs = [ kdelibs telepathy_qt common_internals ]; + buildInputs = [ kdelibs telepathy_qt common_internals qt_gstreamer ]; buildNativeInputs = [ gettext pkgconfig ]; }; }; diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 98b1f21fb981..e84c16005586 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h"; }; - buildInputs = [ gstreamer gst_plugins_base boost glib qt4 ]; + buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; + propagatedBuildInputs = [ boost ]; buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ]; patches = [ ./boost1.48.patch ];