Author: maggesi
Date: Tue Dec 21 09:37:35 2010
New Revision: 25220
URL: https://svn.nixos.org/websvn/nix/?rev=25220&sc=1
Log:
* Add variable createFindlibDestdir to the setupHook of findlib
* Set createFindlibDestdir to various ocaml packages.
Modified:
nixpkgs/trunk/pkgs/development/ocaml-modules/camlzip/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.7.3.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.8.1.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/cryptgps/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/menhir/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/ounit/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/pcre/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/sqlite3/default.nix
nixpkgs/trunk/pkgs/development/ocaml-modules/ssl/default.nix
nixpkgs/trunk/pkgs/development/tools/ocaml/findlib/default.nix
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/camlzip/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/camlzip/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/camlzip/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -18,6 +18,8 @@
patches = [ ./makefile.patch ];
+ createFindlibDestdir = true;
+
postPatch = ''
substitute ${./META} META --subst-var-by VERSION "${version}"
substituteInPlace Makefile \
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.7.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.7.3.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.7.3.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -15,7 +15,7 @@
buildInputs = [ocaml findlib];
- #dontAddPrefix = true;
+ createFindlibDestdir = true;
meta = {
homepage = http://camomile.sourceforge.net/;
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.8.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.8.1.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/camomile/0.8.1.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -15,7 +15,11 @@
buildInputs = [ocaml findlib];
- #dontAddPrefix = true;
+ preInstall = ''
+ ensureDir $OCAMLFIND_DESTDIR
+ '';
+
+ createFindlibDestdir = true;
meta = {
homepage = http://camomile.sourceforge.net/;
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/cryptgps/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/cryptgps/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/cryptgps/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -17,6 +17,8 @@
configurePhase = "true"; # Skip configure phase
+ createFindlibDestdir = true;
+
meta = {
homepage = http://projects.camlcity.org/projects/cryptgps.html;
description = "Cryptographic functions for OCaml";
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/menhir/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/menhir/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/menhir/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -17,6 +17,8 @@
configurePhase = "true"; # Skip configure
+ createFindlibDestdir = true;
+
preBuild = ''
#Fix makefiles.
RM=$(type -p rm)
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/ounit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/ounit/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/ounit/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -23,6 +23,8 @@
checkTarget = "test";
+ createFindlibDestdir = true;
+
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "Unit test framework for OCaml";
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/pcre/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/pcre/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/pcre/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -16,6 +16,8 @@
buildInputs = [pcre ocaml findlib];
+ createFindlibDestdir = true;
+
configurePhase = "true"; # Skip configure phase
meta = {
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/sqlite3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/sqlite3/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/sqlite3/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -23,6 +23,8 @@
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";
Modified: nixpkgs/trunk/pkgs/development/ocaml-modules/ssl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/ocaml-modules/ssl/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/ocaml-modules/ssl/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -19,6 +19,8 @@
configureFlags = "--disable-ldconf";
+ createFindlibDestdir = true;
+
meta = {
homepage = http://savonet.rastageeks.org/;
description = "OCaml bindings for libssl ";
Modified: nixpkgs/trunk/pkgs/development/tools/ocaml/findlib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/ocaml/findlib/default.nix Tue Dec
21 08:33:37 2010 (r25219)
+++ nixpkgs/trunk/pkgs/development/tools/ocaml/findlib/default.nix Tue Dec
21 09:37:35 2010 (r25220)
@@ -40,6 +40,9 @@
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=(''${envhoo...@]} addOCamlPath)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
