diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-05-29 05:26:45 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-06 07:14:25 +0000 |
| commit | 535a8b000f7f7538de70f8441c56316c51355451 (patch) | |
| tree | 2b7cdfab02c79054e95e3a56cc2f6fbb3431130a /pkgs/development/ocaml-modules/janestreet | |
| parent | 69ac6be0096c15b0a2f60b788aac00dc99ccce1c (diff) | |
| download | nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar.gz nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar.bz2 nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar.lz nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar.xz nixlib-535a8b000f7f7538de70f8441c56316c51355451.tar.zst nixlib-535a8b000f7f7538de70f8441c56316c51355451.zip | |
ocamlPackages.buildOcamlJane: use opaline
Diffstat (limited to 'pkgs/development/ocaml-modules/janestreet')
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index 61b2038bfd29..fdb0d8034e69 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -1,4 +1,4 @@ -{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : +{ buildOcaml, opaline, js_build_tools, ocaml_oasis, fetchurl } : { name, version ? "113.33.03", buildInputs ? [], hash ? "", @@ -14,7 +14,7 @@ buildOcaml (args // { hasSharedObjects = true; - buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; + buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs; dontAddPrefix = true; @@ -22,14 +22,6 @@ buildOcaml (args // { buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make"; - installPhase = '' - opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install - if [ -d $out/lib/${name} ] - then if [ "$(ls -A $out/lib/${name})" ] - then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name} - fi - rmdir $out/lib/${name} - fi - ''; + installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install"; }) |