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

Added marble support to kdeplasma-addons 

svn path=/nixpkgs/trunk/; revision=17055
This commit is contained in:
Sander van der Burg 2009-09-11 14:46:39 +00:00
parent cdfc752210
commit 9612c02ad7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.3/default.nix
View File

@ -151,7 +151,7 @@ rec {
kdeplasma_addons = import ./plasma-addons { kdeplasma_addons = import ./plasma-addons {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info;
inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics; inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu;
inherit automoc4 phonon soprano eigen qimageblitz; inherit automoc4 phonon soprano eigen qimageblitz;
}; };

5
pkgs/desktops/kde-4.3/plasma-addons/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info { stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info
, kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics , kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics, kdeedu
, automoc4, phonon, soprano, eigen, qimageblitz}: , automoc4, phonon, soprano, eigen, qimageblitz}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,8 +12,9 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
includeAllQtDirs=true; includeAllQtDirs=true;
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
KDEDIRS="${kdeedu}";
buildInputs = [ cmake qt4 perl python shared_mime_info buildInputs = [ cmake qt4 perl python shared_mime_info
kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu
automoc4 phonon soprano eigen qimageblitz ]; automoc4 phonon soprano eigen qimageblitz ];
meta = { meta = {
description = "KDE Plasma Addons"; description = "KDE Plasma Addons";