diff options
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/reason/default.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1ee6fee613c9..d2295d2d79b0 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation (args // rec { ''; platforms = with platforms; linux ++ darwin; + broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06"; }; }) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index f4cc1cf2b650..81c935fc421f 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder +{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune , menhir, merlin_extend, ppx_tools_versioned, utop }: @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ]; + buildInputs = [ makeWrapper ocaml findlib dune utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed installPhase = '' for p in reason rtop do - ${jbuilder.installPhase} $p.install + ${dune.installPhase} $p.install done wrapProgram $out/bin/rtop \ |