Updated openbabel to 2.2.1 and fixed style so that kdeedu can use it. Enabled ocaml support in kdeedu

svn path=/nixpkgs/trunk/; revision=14494
This commit is contained in:
Sander van der Burg 2009-03-10 14:41:50 +00:00
parent f81bbde9d2
commit e629ce0e07
2 changed files with 10 additions and 9 deletions

View file

@ -8,6 +8,6 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.2.1/src/kdeedu-4.2.1.tar.bz2;
sha1 = "f2381f33f6586b950e925423d135b9e66b7bf428";
};
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
kdelibs automoc4 phonon ];
}

View file

@ -1,13 +1,14 @@
args: with args;
{stdenv, fetchurl, zlib, libxml2}:
stdenv.mkDerivation {
name = "openbabel-2.1.1";
src = fetchurl {
url = mirror://sf/openbabel/openbabel-2.1.1.tar.gz;
sha256 = "1rgvci796a7bmc49ih26ma7c248d32w6drs3cwljpjk0dllsqdif";
};
name = "openbabel-2.2.1";
src = fetchurl {
url = mirror://sf/openbabel/openbabel-2.2.1.tar.gz;
sha256 = "822345d70778de1d2d9afe65a659f1719b8ca300066fb1fa2f473bc97c457e80";
};
# TODO : perl & python bindings;
# TODO : wxGTK: I have no time to compile
# TODO : separate lib and apps
buildInputs = [zlib libxml2];
configureFlags = "--enable-shared --disable-static";
buildInputs = [ zlib libxml2 ];
configureFlags = "--enable-shared --disable-static";
}