public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.buildOcamlJane: use opaline

Browse Source
This commit is contained in:
Vincent Laporte 2018-05-29 05:26:45 +00:00
parent 69ac6be009
commit 535a8b000f
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
View File

@ -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 ? [], { name, version ? "113.33.03", buildInputs ? [],
hash ? "", hash ? "",
@ -14,7 +14,7 @@ buildOcaml (args // {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs;
dontAddPrefix = true; dontAddPrefix = true;
@ -22,14 +22,6 @@ buildOcaml (args // {
buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make"; buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make";
installPhase = '' installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install";
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
'';
}) })