From 67b72b743032fa01206a71462292b664ad024bcc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:11:59 +0100 Subject: [PATCH] ocamlPackages.reason: use Dune 2 --- pkgs/development/compilers/reason/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 4c0e9c29851..435813ee5e7 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" \