From 1932d101e21dfab5af1c475c10b5ae463d28a283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 18 Dec 2015 10:51:27 +0100
Subject: [PATCH] telepathy-qt: minor update, fix by patch, unify

- The patch fixes building against gst-1.6.
- Having to change three files with almost same contents would drive me mad,
  so I unified them into a single expression. /cc @ttuegel
- libxslt seemed unneeded, and it uses libxml2 anyway.
---
 .../libraries/telepathy/qt/default.nix        | 20 +++++++++----
 .../libraries/telepathy/qt5/default.nix       | 29 -------------------
 .../libraries/telepathy/qt5/old.nix           | 29 -------------------
 pkgs/top-level/all-packages.nix               |  6 ++--
 4 files changed, 17 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/libraries/telepathy/qt5/default.nix
 delete mode 100644 pkgs/development/libraries/telepathy/qt5/old.nix

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`"
   '';
diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix
deleted file mode 100644
index 1c18e8446892..000000000000
--- a/pkgs/development/libraries/telepathy/qt5/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, cmake, qtbase, 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 = [ qtbase 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/development/libraries/telepathy/qt5/old.nix b/pkgs/development/libraries/telepathy/qt5/old.nix
deleted file mode 100644
index 50d569f30917..000000000000
--- a/pkgs/development/libraries/telepathy/qt5/old.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ 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 e109024a199c..13cac40328f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8190,7 +8190,7 @@ let
 
     signon = callPackage ../development/libraries/signon { };
 
-    telepathy = callPackage ../development/libraries/telepathy/qt5 { };
+    telepathy = callPackage ../development/libraries/telepathy/qt { };
 
     vlc = callPackage ../applications/video/vlc {
       qt4 = null;
@@ -8503,9 +8503,9 @@ let
 
   telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
 
-  telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
+  telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };
 
-  telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {};
+  telepathy_qt5 = telepathy_qt.override { qtbase = qt5.base; };
 
   tevent = callPackage ../development/libraries/tevent {
     python = python2;