* Add variable createFindlibDestdir to the setupHook of findlib

* Set createFindlibDestdir to various ocaml packages.

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

pkgs/development/ocaml-modules/camlzip/default.nix

@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   patches = [ ./makefile.patch ];
 
+  createFindlibDestdir = true;
+
   postPatch = ''
     substitute ${./META} META --subst-var-by VERSION "${version}"
     substituteInPlace Makefile \

pkgs/development/ocaml-modules/camomile/0.7.3.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml findlib];
 
-  #dontAddPrefix = true;
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://camomile.sourceforge.net/;

pkgs/development/ocaml-modules/camomile/0.8.1.nix

@@ -15,7 +15,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml findlib];
 
-  #dontAddPrefix = true;
+  preInstall = ''
+    ensureDir $OCAMLFIND_DESTDIR
+  '';
+
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://camomile.sourceforge.net/;

pkgs/development/ocaml-modules/cryptgps/default.nix

@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   configurePhase = "true";	# Skip configure phase
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://projects.camlcity.org/projects/cryptgps.html;
     description = "Cryptographic functions for OCaml";

pkgs/development/ocaml-modules/menhir/default.nix

@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   configurePhase = "true";	# Skip configure
 
+  createFindlibDestdir = true;
+
   preBuild = ''
     #Fix makefiles.
     RM=$(type -p rm)

pkgs/development/ocaml-modules/ounit/default.nix

@@ -23,6 +23,8 @@ stdenv.mkDerivation {
 
   checkTarget = "test";
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
     description = "Unit test framework for OCaml";

pkgs/development/ocaml-modules/pcre/default.nix

@@ -16,6 +16,8 @@ stdenv.mkDerivation {
 
   buildInputs = [pcre ocaml findlib];
 
+  createFindlibDestdir = true;
+
   configurePhase = "true";	# Skip configure phase
 
   meta = {

pkgs/development/ocaml-modules/sqlite3/default.nix

@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     ensureDir $out/bin
   '';
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = "http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3";
     description = "OCaml bindings to the SQLite 3 database access library";

pkgs/development/ocaml-modules/ssl/default.nix

@@ -19,6 +19,8 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-ldconf";
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://savonet.rastageeks.org/;
     description = "OCaml bindings for libssl ";

pkgs/development/tools/ocaml/findlib/default.nix

@@ -40,6 +40,9 @@ stdenv.mkDerivation {
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/"
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
+        if test -n $createFindlibDestdir; then
+          ensureDir $OCAMLFIND_DESTDIR
+        fi
     }
     
     envHooks=(''${envHooks[@]} addOCamlPath)