diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-12-29 16:11:59 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-01-05 18:23:20 +0100 |
commit | 67b72b743032fa01206a71462292b664ad024bcc (patch) | |
tree | f5ffe5950e9e6f36b6dc70000e04203739461f8c /pkgs/development/compilers/reason | |
parent | d9dba88d08a9cdf483c3d45f0d7220cf97a4ce64 (diff) |
ocamlPackages.reason: use Dune 2
Diffstat (limited to 'pkgs/development/compilers/reason')
-rw-r--r-- | pkgs/development/compilers/reason/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 4c0e9c2985190..435813ee5e7a3 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune +{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: @@ -17,13 +17,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune cppo fix utop menhir ]; + buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed - inherit (dune) installPhase; - - postInstall = '' + installPhase = '' + dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ |