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

ocamlPackages.reason: use Dune 2

This commit is contained in:
Vincent Laporte 2020-12-29 16:11:59 +01:00 committed by Vincent Laporte
parent d9dba88d08
commit 67b72b7430
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/reason/default.nix
View File

@ -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 , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
}: }:
@ -17,13 +17,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; 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 buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
inherit (dune) installPhase; installPhase = ''
dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR
postInstall = ''
wrapProgram $out/bin/rtop \ wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \ --prefix PATH : "${utop}/bin" \
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \