From d61f35545c15ea720a3990b2491eb2b8e89c6cf8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:40 +0000 Subject: [PATCH] kdeedu: drop libfacile as kdeedu fails to find it; use libspectre. svn path=/nixpkgs/trunk/; revision=21608 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/edu/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 7461bf8f879..86d9e5da81a 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -122,7 +122,7 @@ pkgs.recurseIntoAttrs (rec { kdeedu = import ./edu { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost; - inherit (pkgs) readline gmm gsl facile ocaml xplanet; + inherit (pkgs) readline gmm gsl xplanet libspectre; inherit kdelibs attica; inherit automoc4 phonon eigen; }; diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix index 451a505fd85..ca228e4d566 100644 --- a/pkgs/desktops/kde-4.4/edu/default.nix +++ b/pkgs/desktops/kde-4.4/edu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl -, facile, ocaml, xplanet +, xplanet, libspectre , kdelibs, automoc4, phonon, eigen, attica}: stdenv.mkDerivation { @@ -8,8 +8,9 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2; sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7"; }; - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet - kdelibs automoc4 phonon eigen attica ]; +#TODO: facile, indi, boost.python, cfitsio, R, qalculate + buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet + kdelibs automoc4 phonon eigen attica libspectre ]; meta = { description = "KDE Educative software"; license = "GPL";