diff options
Diffstat (limited to 'pkgs/build-support/ocaml/dune.nix')
-rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index b134effab8a..c049878d013 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,11 +1,11 @@ -{ stdenv, ocaml, findlib, dune, dune_2, opaline }: +{ lib, stdenv, ocaml, findlib, dune_1, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: -let Dune = if args.useDune2 or false then dune_2 else dune; in +let Dune = if args.useDune2 or false then dune_2 else dune_1; in -if args ? minimumOCamlVersion && - ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion +if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || + (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) then throw "${pname}-${version} is not available for OCaml ${ocaml.version}" else @@ -25,11 +25,11 @@ stdenv.mkDerivation ({ ''; installPhase = '' runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} runHook postInstall ''; -} // args // { +} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; |