4 files changed, 8 insertions, 23 deletions
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index b2e7e131a81..4f7e9469bbf 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, x11 }:
 
 stdenv.mkDerivation {
   name = "ocaml-3.08.0";
diff --git a/pkgs/development/compilers/ocaml/3.09.1.nix b/pkgs/development/compilers/ocaml/3.09.1.nix
deleted file mode 100644
index 6e9922ccc36..00000000000
--- a/pkgs/development/compilers/ocaml/3.09.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "ocaml-3.09.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
-    md5 = "c73f4b093e27ba5bf13d62923f89befc";
-  };
-  configureScript = ./configure-3.09.1;
-  dontAddPrefix = "True";
-  configureFlags = ["-no-tk" "-x11lib" x11];
-  buildFlags = ["world" "bootstrap" "opt"];
-  checkTarget = ["opt.opt"];
-  buildInputs = [x11  ncurses];
-}
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 8a8ddd7ee97..a77e5fdd0ac 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
   
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix
index c825830e43d..e22db680577 100644
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -1,11 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, ncurses, x11 }:
 
 let
-   useX11 = (stdenv.system != "armv5tel-linux");
-   useNativeCompilers = (stdenv.system != "armv5tel-linux");
+   useX11 = stdenv.system != "armv5tel-linux";
+   useNativeCompilers = stdenv.system != "armv5tel-linux";
    inherit (stdenv.lib) optionals optionalString;
 in
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   
   name = "ocaml-3.11.1";
   
@@ -49,4 +50,4 @@ stdenv.mkDerivation (rec {
        '';
   };
 
-})
+}