Upgraded KDE SDK, Multimedia, Webdev to 4.3.1

svn path=/nixpkgs/trunk/; revision=17009
This commit is contained in:
Sander van der Burg 2009-09-10 13:57:37 +00:00
parent 4e39d699c4
commit 48497bd320
4 changed files with 44 additions and 22 deletions

View file

@ -121,9 +121,9 @@ rec {
};
kdemultimedia = import ./multimedia {
inherit (pkgs) stdenv fetchurl cmake perl qt4;
inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia;
inherit kdelibs;
inherit (pkgs) stdenv fetchurl lib cmake perl qt4;
inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia lame;
inherit kdelibs kdelibs_experimental;
inherit automoc4 phonon;
};
@ -176,13 +176,13 @@ rec {
};
kdesdk = import ./sdk {
inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost subversion apr aprutil;
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost subversion apr aprutil;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon strigi;
};
kdewebdev = import ./webdev {
inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost;
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost;
inherit kdelibs kdepimlibs;
inherit automoc4 phonon;
};

View file

@ -1,13 +1,22 @@
{stdenv, fetchurl, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, cdparanoia,
kdelibs, automoc4, phonon}:
{ stdenv, fetchurl, lib, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, cdparanoia, lame
, kdelibs, kdelibs_experimental, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdemultimedia-4.2.4";
name = "kdemultimedia-4.3.1";
src = fetchurl {
url = mirror://kde/stable/4.2.4/src/kdemultimedia-4.2.4.tar.bz2;
sha1 = "ab1f9e38ab38d502aa771a70137ded811f40ad1c";
url = mirror://kde/stable/4.3.1/src/kdemultimedia-4.3.1.tar.bz2;
sha1 = "ef50f869f1a6cdf91fe7808f095fccbd9463a7dd";
};
includeAllQtDirs=true;
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia
kdelibs automoc4 phonon ];
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
kdelibs kdelibs_experimental automoc4 phonon ];
meta = {
description = "KDE Multimedia";
longDescription = ''
Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
'';
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil,
kdelibs, kdepimlibs, automoc4, phonon, strigi}:
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil
, kdelibs, kdepimlibs, automoc4, phonon, strigi}:
stdenv.mkDerivation {
name = "kdesdk-4.2.4";
name = "kdesdk-4.3.1";
src = fetchurl {
url = mirror://kde/stable/4.2.4/src/kdesdk-4.2.4.tar.bz2;
sha1 = "ad5a00f5ee4ae0f627b971b7413edb0550e92db1";
url = mirror://kde/stable/4.3.1/src/kdesdk-4.3.1.tar.bz2;
sha1 = "ded236a12002b824f97856ce5dc882161ed437d2";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;
@ -13,4 +13,11 @@ stdenv.mkDerivation {
inherit aprutil;
buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil
kdelibs kdepimlibs automoc4 phonon strigi ];
meta = {
description = "KDE SDK";
longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

View file

@ -1,13 +1,19 @@
{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost,
kdelibs, kdepimlibs, automoc4, phonon}:
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost
, kdelibs, kdepimlibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdewebdev-4.2.4";
name = "kdewebdev-4.3.1";
src = fetchurl {
url = mirror://kde/stable/4.2.4/src/kdewebdev-4.2.4.tar.bz2;
sha1 = "9e3667c994793232177a70ff0b6fb2caa252757f";
url = mirror://kde/stable/4.3.1/src/kdewebdev-4.3.1.tar.bz2;
sha1 = "28580c6f283fa7a6405f6a4415ebe9a4167f0992";
};
includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
meta = {
description = "KDE Web development utilities";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}