diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-07 12:20:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 12:20:40 +0000 |
| commit | dcea8212b53368f7d13227b4c599148ecdbc8c47 (patch) | |
| tree | febf5f0cd31c1cbcdd814291e5ce02cfb371c2bd /pkgs/build-support | |
| parent | 65cddb74d7408da1c2dd19782bd1ae997e2f3a82 (diff) | |
| parent | 69be5320bbf38164d5703fdea50724f61dc78f67 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index f9f59b21510f5..56fe8a60484ed 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, ocaml, findlib, dune, dune_2 }: +{ 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 && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion |