summary refs log tree commit diff
path: root/pkgs/tools/networking/p2p
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2010-01-30 19:30:30 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2010-01-30 19:30:30 +0000
commit0e55350a857550e9b3147eace65bdf511d252ee1 (patch)
treeb15759f92e720cc8f9d4955067ab80aca5225118 /pkgs/tools/networking/p2p
parent486ec4bddd4e50c06b65e07456fe71ac420372f3 (diff)
downloadnixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar.gz
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar.bz2
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar.lz
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar.xz
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.tar.zst
nixlib-0e55350a857550e9b3147eace65bdf511d252ee1.zip
update ktorrent to 3.3.3, also make it depend on KDE 4.3
svn path=/nixpkgs/trunk/; revision=19737
Diffstat (limited to 'pkgs/tools/networking/p2p')
-rw-r--r--pkgs/tools/networking/p2p/ktorrent/default.nix22
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/tools/networking/p2p/ktorrent/default.nix b/pkgs/tools/networking/p2p/ktorrent/default.nix
index 00b6f28dfe9d..4966a9f9c6ec 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
+  ];
+
+  propagatedBuildInputs = [
+    kde.qt4 kde.automoc4 kde.kdelibs kde.phonon kde.qca2 kde.kdepimlibs
   ];
-  
-  configureFlags = "--without-arts";
 
+  CMAKE_PREFIX_PATH=kde.kdepimlibs;
+  cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
+  includeAllQtDirs=true;
+  
   meta = {
     homepage = http://ktorrent.org/;
     description = "A BitTorrent client for KDE";