diff options
| author | Malcolm Matalka <malcolm.matalka@klarna.com> | 2012-11-15 23:19:32 +0100 |
|---|---|---|
| committer | Malcolm Matalka <malcolm.matalka@klarna.com> | 2012-11-16 11:43:32 +0100 |
| commit | 6299baeb88cdeaa19275b0a2386e552e6347e93f (patch) | |
| tree | 38f71f5c7e6689a5e421ad3b3e185e983b055a8a /pkgs/development/tools/ocaml/findlib | |
| parent | 7c146f01e1ffd8c730574d2767c0627a80a82029 (diff) | |
| download | nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar.gz nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar.bz2 nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar.lz nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar.xz nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.tar.zst nixpkgs-6299baeb88cdeaa19275b0a2386e552e6347e93f.zip | |
Support installing topfind now
Diffstat (limited to 'pkgs/development/tools/ocaml/findlib')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 3170712b9ba..0291e47f612 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch ]; + patchFlags = "-p0"; dontAddPrefix=true; @@ -24,7 +25,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..03eefb54cb1 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -0,0 +1,12 @@ +--- src/findlib/Makefile ++++ 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)"; }; \ + |