a747baba00
* gnu/packages/ocaml.scm (ocaml-findlib): New variable. * gnu/packages/patches/ocaml-findlib-make-install.patch: New file. * gnu-system.am (dist_patch_DATA): Register it.
21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
Ocaml wants to install its "core" libraries in OCAML_CORE_STDLIB. That
|
|
does not work in a store-based distribution.
|
|
|
|
A solution was already provided by Nix
|
|
|
|
https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/ocaml/findlib/install_topfind.patch
|
|
|
|
regenerated for Guix.
|
|
|
|
--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200
|
|
+++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200
|
|
@@ -89,7 +89,7 @@
|
|
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 findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
|
|
cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
|