diff --git a/pkgs/tools/networking/p2p/ktorrent/default.nix b/pkgs/tools/networking/p2p/ktorrent/default.nix deleted file mode 100644 index db9e23197af..00000000000 --- a/pkgs/tools/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, kde, xlibs, zlib -, libpng, libjpeg, perl, gmp, cmake, gettext, boost -}: - -stdenv.mkDerivation { - name = "ktorrent-3.3.3"; - - src = fetchurl { - url = http://ktorrent.org/downloads/3.3.3/ktorrent-3.3.3.tar.bz2; - sha256 = "1f2hr8q8j1fxd3wa74vavq7b0spdsjfcl3jbyfi9xhk9mxxlm216"; - }; - - buildInputs = [ - pkgconfig xlibs.xlibs zlib libpng libjpeg perl gmp cmake gettext boost - ]; - - propagatedBuildInputs = [ - kde.qt4 kde.automoc4 kde.kdelibs kde.phonon kde.qca2 kde.kdepimlibs - ]; - - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - includeAllQtDirs=true; - - meta = { - homepage = http://ktorrent.org/; - description = "A BitTorrent client for KDE"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c199824c789..bc20f4af381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,11 +997,7 @@ let inherit fetchurl stdenv libpcap ncurses expat pcre; }; - ktorrent = import ../tools/networking/p2p/ktorrent { - inherit fetchurl stdenv pkgconfig boost - xlibs zlib libpng libjpeg perl gmp cmake gettext; - kde = kde44; - }; + ktorrent = kde4.ktorrent; less = import ../tools/misc/less { inherit fetchurl stdenv ncurses;