telepathy_qt: 0.9.6.1 → 0.9.7

1 files changed, 22 insertions, 36 deletions

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 93d69d5a8d9..18888df5c52 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -4,51 +4,37 @@
 let
   inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.6.1";
+  name = "telepathy-qt-0.9.7";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9";
+    sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1";
   };
 
-  patches = let
-    mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash;
-    in [
-      (fetchpatch {
-        name = "gst-1.6.patch";
-        url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
-        sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
-      })
-      (fetchpatch {
-        name = "parallel-make-1.patch";
-        url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e";
-        sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw";
-      })
-      (fetchpatch {
-        name = "parallel-make-2.patch";
-        url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5";
-        sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57";
-      })
-    ];
-
   nativeBuildInputs = [ cmake pkgconfig python ];
-  propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ];
-
-  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
-
-  cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}";
-
-  # should be removable after the next update
-  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
-
-  preBuild = ''
-    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
-  '';
+  propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ];
+  buildInputs = [ dbus_glib ];
+  checkInputs = [ dbus_daemon dbus-python ];
+
+  patches = [
+    # https://github.com/TelepathyIM/telepathy-qt/issues/25
+    (fetchpatch {
+      url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch;
+      sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh";
+    })
+  ];
+
+  # No point in building tests if they are not run
+  # On 0.9.7, they do not even build with QT4
+  cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
 
   enableParallelBuilding = true;
   doCheck = false; # giving up for now
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Telepathy Qt bindings";
+    homepage = https://telepathy.freedesktop.org/components/telepathy-qt/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
   };
 }