lol

ocamlPackages.buildOcamlJane: use opaline

+3 -11
+3 -11
pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
··· 1 - { buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : 1 + { buildOcaml, opaline, js_build_tools, ocaml_oasis, fetchurl } : 2 2 3 3 { name, version ? "113.33.03", buildInputs ? [], 4 4 hash ? "", ··· 14 14 15 15 hasSharedObjects = true; 16 16 17 - buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; 17 + buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs; 18 18 19 19 dontAddPrefix = true; 20 20 ··· 22 22 23 23 buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make"; 24 24 25 - installPhase = '' 26 - opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install 27 - if [ -d $out/lib/${name} ] 28 - then if [ "$(ls -A $out/lib/${name})" ] 29 - then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name} 30 - fi 31 - rmdir $out/lib/${name} 32 - fi 33 - ''; 25 + installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install"; 34 26 35 27 })