From 8e0100ba8516a4c0bd7bafa49ccd5673bcadfbfb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 May 2018 06:50:17 +0000 Subject: [PATCH] ocamlPackages.ppx_import: use opaline --- pkgs/development/ocaml-modules/ppx_import/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 991af1e41de1..3948cfce0e8e 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, buildOcaml, ocaml, opam, +{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline, cppo, ppx_tools, ounit, ppx_deriving}: buildOcaml rec { @@ -15,15 +15,12 @@ buildOcaml rec { sha256 = "14c2lp7r9080c4hsb1y1drbxxx3v44b7ib5wfh3kkh3f1jfsjwbk"; }; - buildInputs = [ cppo ounit ppx_deriving opam ]; + buildInputs = [ cppo ounit ppx_deriving opaline ]; doCheck = true; checkTarget = "test"; - installPhase = '' - opam-installer --script --prefix=$out ppx_import.install | sh - ln -s $out/lib/ppx_import $out/lib/ocaml/${ocaml.version}/site-lib - ''; + installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; meta = with stdenv.lib; { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";