Author: maggesi
Date: Fri Sep  3 13:48:35 2010
New Revision: 23618
URL: https://svn.nixos.org/websvn/nix/?rev=23618&sc=1

Log:
Include directory for OCaml's C headers.

Make an include directory and symlinks ocaml's C header files into
that directory.  By having an include directory it is automatically
propogated as to NIX_CFLAGS_COMPILE for anyone who uses ocaml as a
build input.

(Proposed on the mailing list by Russell O'Connor.)

Modified:
   nixpkgs/trunk/pkgs/development/compilers/ocaml/3.10.0.nix
   nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.10.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ocaml/3.10.0.nix   Fri Sep  3 
13:21:38 2010        (r23617)
+++ nixpkgs/trunk/pkgs/development/compilers/ocaml/3.10.0.nix   Fri Sep  3 
13:48:35 2010        (r23618)
@@ -18,6 +18,10 @@
     CAT=$(type -tp cat)
     sed -e "s@/bin/c...@$cat@" -i config/auto-aux/sharpbang
   '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;

Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix   Fri Sep  3 
13:21:38 2010        (r23617)
+++ nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix   Fri Sep  3 
13:48:35 2010        (r23618)
@@ -24,6 +24,10 @@
     CAT=$(type -tp cat)
     sed -e "s@/bin/c...@$cat@" -i config/auto-aux/sharpbang
   '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to