Nix expression for ocaml compiler.

- The package has a non-standard build interface;
  fixed with hooks for genericBuild
- The graph library requires x11 and the configure
  script looks in absolute directory paths to find
  X11. Fixed by using patched configure script from
  which the absolute paths have been removed. As
  a consequence the graph library is not build until
  we have X11 support in Nix.


svn path=/nixpkgs/trunk/; revision=1188

pkgs/development/compilers/ocaml/builder.sh

@@ -1,4 +1,13 @@
 . $stdenv/setup
 
-configureFlags=""
+
+configureFlags="-prefix $out $configureFlags"
 genericBuild
+
+#  make world
+#  make bootstrap
+#  make opt
+#  make opt.opt
+#  make install
+#cd emacs/
+#make EMACSDIR=$out/share/ocaml/emacs

pkgs/development/compilers/ocaml/default.nix

@@ -6,5 +6,10 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
-  }
+  };
+  configureScript = ./configure;
+  dontAddPrefix = "True";
+  configureFlags = "-no-tk";
+  makeFlags = ["world" "bootstrap" "opt"];
+  checkTarget = ["opt.opt"];
 }

pkgs/system/all-packages-generic.nix

@@ -248,7 +248,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  strategoxt = (import ../development/compilers/ocaml) {
+  ocaml = (import ../development/compilers/ocaml) {
     inherit fetchurl stdenv ;
   };
 

pkgs/system/populate-cache.nix

@@ -57,7 +57,7 @@ let {
     nxml
     uml
     nix
-#    ocaml
+    ocaml
 #    hevea
   ;};