public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ktorrent to 3.3.3, also make it depend on KDE 4.3

Browse Source 
svn path=/nixpkgs/trunk/; revision=19737
This commit is contained in:
Armijn Hemel 2010-01-30 19:30:30 +00:00
parent 486ec4bddd
commit 0e55350a85
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/networking/p2p/ktorrent/default.nix
View File

@ -1,20 +1,26 @@
{ stdenv, fetchurl, pkgconfig, kdelibs, xlibs, zlib { stdenv, fetchurl, pkgconfig, kde, xlibs, zlib
, libpng, libjpeg, perl, gmp , libpng, libjpeg, perl, gmp, cmake, gettext, boost
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ktorrent-2.2.7"; name = "ktorrent-3.3.3";
src = fetchurl { src = fetchurl {
url = http://ktorrent.org/downloads/2.2.7/ktorrent-2.2.7.tar.bz2; url = http://ktorrent.org/downloads/3.3.3/ktorrent-3.3.3.tar.bz2;
sha256 = "0wvv294grv07zwdsycfsyhq5fllqyljrcg5g9iwgn84fk3nszlbi"; sha256 = "1f2hr8q8j1fxd3wa74vavq7b0spdsjfcl3jbyfi9xhk9mxxlm216";
}; };
buildInputs = [ 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 = { meta = {
homepage = http://ktorrent.org/; homepage = http://ktorrent.org/;

5
pkgs/top-level/all-packages.nix
View File

@ -953,8 +953,9 @@ let
}; };
ktorrent = import ../tools/networking/p2p/ktorrent { ktorrent = import ../tools/networking/p2p/ktorrent {
inherit fetchurl stdenv pkgconfig kdelibs inherit fetchurl stdenv pkgconfig boost
xlibs zlib libpng libjpeg perl gmp; xlibs zlib libpng libjpeg perl gmp cmake gettext;
kde = kde43;
}; };
less = import ../tools/misc/less { less = import ../tools/misc/less {