From e723e53699eb78451448d939c3e1b0b102088c6d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:08 +0000
Subject: [PATCH] Use new ktorrent in kde44

svn path=/nixpkgs/trunk/; revision=23755
---
 pkgs/desktops/kde-4.4/default.nix             |  8 +-------
 .../kde-4.4/extragear/ktorrent/default.nix    | 19 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix

diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 59238f5e700..43ce2fff731 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -290,13 +290,7 @@ pkgs.recurseIntoAttrs (rec {
     poppler = pkgs.popplerQt4;
   };
   
-  ktorrent = import ./extragear/ktorrent {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext;
-    inherit kdelibs kdepimlibs kdebase_workspace;
-    inherit automoc4 phonon qca2;
-  };
-  
-  inherit (pkgs) konversation yakuake;
+  inherit (pkgs) konversation yakuake ktorrent;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
diff --git a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
deleted file mode 100644
index 0f83c8764ca..00000000000
--- a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext,
- kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
-
-stdenv.mkDerivation {
-  name = "ktorrent-3.3.4";
-  src = fetchurl {
-    url = http://ktorrent.org/downloads/3.3.4/ktorrent-3.3.4.tar.bz2;
-    sha256 = "09lq5140135v9919k4wfmqww5jm17yvyqny8hlk10zyzd42vh7zk";
-  };
-  cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
-  buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
-                  kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
-  meta = {
-    description = "KDE integrated BitTorrent client";
-    license = "GPL";
-    homepage = http://ktorrent.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}