diff --git a/pkgs/tools/networking/p2p/ktorrent/default.nix b/pkgs/tools/networking/p2p/ktorrent/default.nix index 00b6f28dfe9..4966a9f9c6e 100644 --- a/pkgs/tools/networking/p2p/ktorrent/default.nix +++ b/pkgs/tools/networking/p2p/ktorrent/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, kdelibs, xlibs, zlib -, libpng, libjpeg, perl, gmp +{ stdenv, fetchurl, pkgconfig, kde, xlibs, zlib +, libpng, libjpeg, perl, gmp, cmake, gettext, boost }: stdenv.mkDerivation { - name = "ktorrent-2.2.7"; + name = "ktorrent-3.3.3"; src = fetchurl { - url = http://ktorrent.org/downloads/2.2.7/ktorrent-2.2.7.tar.bz2; - sha256 = "0wvv294grv07zwdsycfsyhq5fllqyljrcg5g9iwgn84fk3nszlbi"; + url = http://ktorrent.org/downloads/3.3.3/ktorrent-3.3.3.tar.bz2; + sha256 = "1f2hr8q8j1fxd3wa74vavq7b0spdsjfcl3jbyfi9xhk9mxxlm216"; }; buildInputs = [ - pkgconfig kdelibs kdelibs.qt xlibs.xlibs zlib libpng libjpeg perl gmp + pkgconfig xlibs.xlibs zlib libpng libjpeg perl gmp cmake gettext boost ]; - - configureFlags = "--without-arts"; + propagatedBuildInputs = [ + kde.qt4 kde.automoc4 kde.kdelibs kde.phonon kde.qca2 kde.kdepimlibs + ]; + + CMAKE_PREFIX_PATH=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 fb63148e277..c0823688560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -953,8 +953,9 @@ let }; ktorrent = import ../tools/networking/p2p/ktorrent { - inherit fetchurl stdenv pkgconfig kdelibs - xlibs zlib libpng libjpeg perl gmp; + inherit fetchurl stdenv pkgconfig boost + xlibs zlib libpng libjpeg perl gmp cmake gettext; + kde = kde43; }; less = import ../tools/misc/less {