diff options
Diffstat (limited to 'pkgs/development/libraries/telepathy/qt/default.nix')
-rw-r--r-- | pkgs/development/libraries/telepathy/qt/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index f2e0d1945620..4ec8c4befc69 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib +{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon , telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.3"; + name = "telepathy-qt-0.9.4"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0"; + sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi"; }; + patches = [ ./farstream-0.2.diff ]; + nativeBuildInputs = [ cmake pkgconfig python libxslt ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; - patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ]; + + buildInputs = stdenv.lib.optional doCheck dbus_daemon; + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; + + enableParallelBuilding = true; + doCheck = false; # giving up for now } |