diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix index 50d569f30917..1c18e8446892 100644 --- a/pkgs/development/libraries/telepathy/qt5/default.nix +++ b/pkgs/development/libraries/telepathy/qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, libxslt, dbus_glib, dbus_daemon , telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; diff --git a/pkgs/development/libraries/telepathy/qt5/old.nix b/pkgs/development/libraries/telepathy/qt5/old.nix new file mode 100644 index 000000000000..50d569f30917 --- /dev/null +++ b/pkgs/development/libraries/telepathy/qt5/old.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon +, telepathy_farstream, telepathy_glib, pythonDBus }: + +stdenv.mkDerivation rec { + name = "telepathy-qt5-0.9.5"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; + }; + + nativeBuildInputs = [ cmake pkgconfig python libxslt ]; + propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + + cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; + + 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 + + meta = { + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 745ec5bb7096..5dd6aedf57ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7962,6 +7962,8 @@ let signon = callPackage ../development/libraries/signon { }; + telepathy = callPackage ../development/libraries/telepathy/qt5 { }; + vlc = callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; @@ -8267,7 +8269,7 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; - telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5 { }; + telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {}; tevent = callPackage ../development/libraries/tevent { python = python2;