diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-09-11 14:46:39 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-09-11 14:46:39 +0000 |
| commit | 9612c02ad73c0fcb6bd2af2d385225022678ad81 (patch) | |
| tree | b3b46b922e10e42dc739537958e07831dbb2b174 | |
| parent | cdfc752210496f3266f106cdadbf7f1ac9e980fc (diff) | |
| download | nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar.gz nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar.bz2 nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar.lz nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar.xz nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.tar.zst nixlib-9612c02ad73c0fcb6bd2af2d385225022678ad81.zip | |
Added marble support to kdeplasma-addons
svn path=/nixpkgs/trunk/; revision=17055
| -rw-r--r-- | pkgs/desktops/kde-4.3/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.3/plasma-addons/default.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index f8036b8303f6..9c439a4e653e 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -151,7 +151,7 @@ rec { 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 kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu; inherit automoc4 phonon soprano eigen qimageblitz; }; diff --git a/pkgs/desktops/kde-4.3/plasma-addons/default.nix b/pkgs/desktops/kde-4.3/plasma-addons/default.nix index 02919573a9a6..44d85040bc2d 100644 --- a/pkgs/desktops/kde-4.3/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.3/plasma-addons/default.nix @@ -1,5 +1,5 @@ { 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}: stdenv.mkDerivation { @@ -12,8 +12,9 @@ stdenv.mkDerivation { builder = ./builder.sh; includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; + KDEDIRS="${kdeedu}"; 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 ]; meta = { description = "KDE Plasma Addons"; |