From e629ce0e0787fb12cd7e087c8760ea84021ec47b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 10 Mar 2009 14:41:50 +0000
Subject: [PATCH] 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
---
 pkgs/desktops/kde-4.2/edu/default.nix           |  2 +-
 .../development/libraries/openbabel/default.nix | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix
index bb5c8566d6e8..5336ecccfb6f 100644
--- a/pkgs/desktops/kde-4.2/edu/default.nix
+++ b/pkgs/desktops/kde-4.2/edu/default.nix
@@ -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 ];
 }
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 10c8dcf0a684..2b994edd74c3 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -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";
 }