alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #187 from orbitz/ocaml-findlib-add-topfind

Browse source 
Ocaml findlib add topfind
This commit is contained in:
Michael Raskin 2012-11-21 21:34:09 -08:00
parent 1b15008952 5ff6be9224
commit 1c32897905
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [m4 ncurses ocaml]; buildInputs = [m4 ncurses ocaml];
patches = [ ./ldconf.patch ]; patches = [ ./ldconf.patch ./install_topfind.patch ];
dontAddPrefix=true; dontAddPrefix=true;
@ -24,7 +24,6 @@ stdenv.mkDerivation {
-mandir $out/share/man -mandir $out/share/man
-sitelib $out/lib/ocaml/${ocaml_version}/site-lib -sitelib $out/lib/ocaml/${ocaml_version}/site-lib
-config $out/etc/findlib.conf -config $out/etc/findlib.conf
-no-topfind
) )
''; '';

12
pkgs/development/tools/ocaml/findlib/install_topfind.patch Normal file
View file

@ -0,0 +1,12 @@
--- findlib-1.3.3/src/findlib/Makefile
+++ findlib-1.3.3/src/findlib/Makefile
@@ -82,7 +82,7 @@ clean:
install: all
mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \