* KTorrent updated to 4.1.1.

svn path=/nixpkgs/trunk/; revision=28193
This commit is contained in:
Eelco Dolstra 2011-08-06 14:28:15 +00:00
parent a751ada1ce
commit 18509c88b3
2 changed files with 20 additions and 16 deletions

View File

@ -1,23 +1,27 @@
{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost, { stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost
gettext, kdebase_workspace }: , gettext, kdebase_workspace, qt4, kdelibs, phonon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = pname + "-" + version; name = pname + "-" + version;
pname = "ktorrent"; pname = "ktorrent";
version = "4.0.5"; version = "4.1.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
sha256 = "1kgy0r9c51w38vj5kjla16vh7nigs89qvvjybjjkv4r41nz9kcfn"; sha256 = "1h0fqh344sfwfbvnwhn00k8czb14568flapjf4754zss6bxpw4g4";
}; };
patches = [ ./find-workspace.diff ]; patches = [ ./find-workspace.diff ];
KDEDIRS = libktorrent; KDEDIRS = libktorrent;
buildInputs = [ automoc4 cmake libktorrent taglib kdepimlibs boost gettext buildInputs =
kdebase_workspace ]; [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs
gettext kdebase_workspace
];
enableParallelBuilding = true;
meta = { meta = {
description = "KDE integrated BtTorrent client"; description = "KDE integrated BtTorrent client";

View File

@ -1,23 +1,23 @@
{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4, { stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
perl, phonon }: , phonon, libgcrypt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = pname + "-" + version; name = pname + "-" + version;
pname = "libktorrent"; pname = "libktorrent";
version = "1.0.3"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/downloads/4${builtins.substring 1 url = "http://ktorrent.org/downloads/4.1.1/${name}.tar.bz2";
(builtins.stringLength version) version}/${name}.tar.bz2"; sha256 = "06d93xpshxawz49hqh6pvypir4ygm1f781hs7yim5k6b7shivfs1";
sha256 = "1yfayzbmi7im0pf4g7awn8lqianpr55xwbsldz7lyj9lc1a3xcgs";
}; };
# TODO: xfs.h buildInputs =
propagatedBuildInputs = [ kdelibs gmp boost qt4 phonon ]; [ cmake kdelibs qt4 automoc4 phonon gmp qca2 boost libgcrypt gettext ];
buildInputs = [ cmake automoc4 qca2 gettext perl ];
enableParallelBuilding = true;
meta = { meta = {
description = "A bittorrent library used in ktorrent"; description = "A BiTtorrent library used by KTorrent";
homepage = http://ktorrent.org; homepage = http://ktorrent.org;
}; };
} }