From 33d7ae6288169938332d6aa7a5a046c13d75e0b8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Sep 2009 14:58:08 +0000 Subject: [PATCH] Upgraded KDE EDU to 4.3.1 svn path=/nixpkgs/trunk/; revision=17011 --- pkgs/desktops/kde-4.3/default.nix | 4 ++-- pkgs/desktops/kde-4.3/edu/default.nix | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 871cb651951..45d096fc2bc 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -105,10 +105,10 @@ rec { }; kdeedu = import ./edu { - inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt openbabel boost; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost; inherit (pkgs) readline gmm gsl facile ocaml; inherit kdelibs; - inherit automoc4 phonon; + inherit automoc4 phonon eigen; }; kdegraphics = import ./graphics { diff --git a/pkgs/desktops/kde-4.3/edu/default.nix b/pkgs/desktops/kde-4.3/edu/default.nix index 5f7b2dc6c3c..12cfa132a02 100644 --- a/pkgs/desktops/kde-4.3/edu/default.nix +++ b/pkgs/desktops/kde-4.3/edu/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl, - facile, ocaml, - kdelibs, automoc4, phonon}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl +, facile, ocaml +, kdelibs, automoc4, phonon, eigen}: stdenv.mkDerivation { - name = "kdeedu-4.2.4"; + name = "kdeedu-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeedu-4.2.4.tar.bz2; - sha1 = "7b26b946e1981ac57efdd2059eb3bba2808aef4b"; + url = mirror://kde/stable/4.3.1/src/kdeedu-4.3.1.tar.bz2; + sha1 = "6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf"; }; includeAllQtDirs=true; buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml - kdelibs automoc4 phonon ]; + kdelibs automoc4 phonon eigen ]; + meta = { + description = "KDE Educative software"; + license = "GPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; }