- Added kdepim-runtime package

- Updated KDE plasma addons to 4.3.1


svn path=/nixpkgs/trunk/; revision=17033
This commit is contained in:
Sander van der Burg 2009-09-10 20:01:22 +00:00
parent b8efc63561
commit 96ff884c3d
3 changed files with 39 additions and 9 deletions

View File

@ -143,12 +143,18 @@ rec {
inherit automoc4 phonon akonadi strigi soprano qca2; inherit automoc4 phonon akonadi strigi soprano qca2;
}; };
kdeplasma_addons = import ./plasma-addons { kdepim_runtime = import ./pim-runtime {
inherit (pkgs) stdenv fetchurl cmake qt4 perl python shared_mime_info; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs kdebase_workspace kdepimlibs kdegraphics; inherit kdelibs kdelibs_experimental kdepimlibs;
inherit automoc4 phonon; inherit automoc4 phonon;
}; };
kdeplasma_addons = import ./plasma-addons {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info;
inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics;
inherit automoc4 phonon soprano eigen qimageblitz;
};
kdegames = import ./games { kdegames = import ./games {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit kdelibs; inherit kdelibs;

View File

@ -0,0 +1,16 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon}:
stdenv.mkDerivation {
name = "kdepim-runtime-4.3.1";
src = fetchurl {
url = mirror://kde/stable/4.3.1/src/kdepim-runtime-4.3.1.tar.bz2;
sha1 = "c39b0fc1d3721fb8c6074ba6a174ad8716c6c604";
};
buildInputs = [ cmake qt4 perl kdelibs kdelibs_experimental kdepimlibs automoc4 phonon ];
meta = {
description = "KDE PIM runtime";
homepage = http://www.kde.org;
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

View File

@ -1,16 +1,24 @@
{stdenv, fetchurl, cmake, qt4, perl, python, shared_mime_info, { stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info
kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}: , kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics
, automoc4, phonon, soprano, eigen, qimageblitz}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdeplasma-addons-4.2.4"; name = "kdeplasma-addons-4.3.1";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/4.2.4/src/kdeplasma-addons-4.2.4.tar.bz2; url = mirror://kde/stable/4.3.1/src/kdeplasma-addons-4.3.1.tar.bz2;
sha1 = "500d05cc6eeb218b8615b1a49e69e3b9e88f3997"; sha1 = "83421181dd3a80c4ac0ff5bab111b7f71f6a1192";
}; };
inherit kdebase_workspace; inherit kdebase_workspace;
builder = ./builder.sh; builder = ./builder.sh;
includeAllQtDirs=true; includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl python shared_mime_info buildInputs = [ cmake qt4 perl python shared_mime_info
kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ]; kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics
automoc4 phonon soprano eigen qimageblitz ];
meta = {
description = "KDE Plasma Addons";
license = "GPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
} }