diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-11-21 21:34:09 -0800 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-11-21 21:34:09 -0800 |
| commit | 1c3289790558d5c8ec1d3df31795249c5f839b40 (patch) | |
| tree | 5ebda746a33098174526f0ea1b86c03a92bd0e9b | |
| parent | 1b150089527b6a7496ac5780d7f01ea56b7ec467 (diff) | |
| parent | 5ff6be922416a738eed6480c24c75309fdb07ef3 (diff) | |
| download | nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar.gz nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar.bz2 nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar.lz nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar.xz nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.tar.zst nixpkgs-1c3289790558d5c8ec1d3df31795249c5f839b40.zip | |
Merge pull request #187 from orbitz/ocaml-findlib-add-topfind
Ocaml findlib add topfind
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 3170712b9ba..aee0040f815 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; @@ -24,7 +24,6 @@ stdenv.mkDerivation { -mandir $out/share/man -sitelib $out/lib/ocaml/${ocaml_version}/site-lib -config $out/etc/findlib.conf - -no-topfind ) ''; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch new file mode 100644 index 00000000000..4729885bcef --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -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)"; }; \ + |