diff options
Diffstat (limited to 'pkgs/development/libraries/telepathy/qt/default.nix')
-rw-r--r-- | pkgs/development/libraries/telepathy/qt/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 7ef48d09725a..1052e92d3807 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, pythonDBus }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, dbus_glib, dbus_daemon +, telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.5"; + name = "telepathy-qt-0.9.6"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; + sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc"; }; + patches = [(fetchpatch { + name = "gst-1.6.patch"; + url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch" + + "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb"; + sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2"; + })]; - nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + nativeBuildInputs = [ cmake pkgconfig python ]; + propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; buildInputs = stdenv.lib.optional doCheck dbus_daemon; + cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; |