Merge pull request #45892 from vbgl/reason

ocamlPackages.reason: remove spurious dependency on opam

1 files changed, 7 insertions, 7 deletions

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 42969a5253ed..f4cc1cf2b650 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, makeWrapper, buildOcaml, fetchFromGitHub,
-  ocaml, opam, jbuilder, menhir, merlin_extend, ppx_tools_versioned, utop }:
+{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
+, menhir, merlin_extend, ppx_tools_versioned, utop
+}:
 
-buildOcaml rec {
-  name = "reason";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-reason-${version}";
   version = "3.3.3";
 
   src = fetchFromGitHub {
@@ -14,12 +15,10 @@ buildOcaml rec {
 
   propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
 
-  buildInputs = [ makeWrapper opam jbuilder utop menhir ];
+  buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
-  createFindlibDestdir = true;
-
   installPhase = ''
     for p in reason rtop
     do
@@ -35,6 +34,7 @@ buildOcaml rec {
     homepage = https://reasonml.github.io/;
     description = "Facebook's friendly syntax to OCaml";
     license = licenses.mit;
+    inherit (ocaml.meta) platforms;
     maintainers = [ maintainers.volth ];
   };
 }