kdeedu: drop libfacile as kdeedu fails to find it; use libspectre.
svn path=/nixpkgs/trunk/; revision=21608
This commit is contained in:
parent
b2ed8f1aa0
commit
d61f35545c
|
@ -122,7 +122,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
|
|
||||||
kdeedu = import ./edu {
|
kdeedu = import ./edu {
|
||||||
inherit (pkgs) stdenv fetchurl lib 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 xplanet;
|
inherit (pkgs) readline gmm gsl xplanet libspectre;
|
||||||
inherit kdelibs attica;
|
inherit kdelibs attica;
|
||||||
inherit automoc4 phonon eigen;
|
inherit automoc4 phonon eigen;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
||||||
, facile, ocaml, xplanet
|
, xplanet, libspectre
|
||||||
, kdelibs, automoc4, phonon, eigen, attica}:
|
, kdelibs, automoc4, phonon, eigen, attica}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -8,8 +8,9 @@ stdenv.mkDerivation {
|
||||||
url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2;
|
url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2;
|
||||||
sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7";
|
sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7";
|
||||||
};
|
};
|
||||||
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
|
#TODO: facile, indi, boost.python, cfitsio, R, qalculate
|
||||||
kdelibs automoc4 phonon eigen attica ];
|
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet
|
||||||
|
kdelibs automoc4 phonon eigen attica libspectre ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE Educative software";
|
description = "KDE Educative software";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
|
Loading…
Reference in a new issue