public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add variable createFindlibDestdir to the setupHook of findlib 

* Set createFindlibDestdir to various ocaml packages.

svn path=/nixpkgs/trunk/; revision=25220
This commit is contained in:
Marco Maggesi 2010-12-21 09:37:35 +00:00
parent 2c85e4b96f
commit eb33e01ac7
10 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

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

2
pkgs/development/ocaml-modules/camomile/0.7.3.nix
View File

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

6
pkgs/development/ocaml-modules/camomile/0.8.1.nix
View File

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

2
pkgs/development/ocaml-modules/cryptgps/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/menhir/default.nix
View File

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

2
pkgs/development/ocaml-modules/ounit/default.nix
View File

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

2
pkgs/development/ocaml-modules/pcre/default.nix
View File

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

2
pkgs/development/ocaml-modules/sqlite3/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/ssl/default.nix
View File

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

3
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -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)