diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-02-26 17:35:41 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-03-07 12:07:14 +0100 |
| commit | 60785fe4dbedc4fd2a4a4980c59357a27b57aabf (patch) | |
| tree | 6af82c56921cbd1c45390de06706ee8a9160a3a5 /pkgs/build-support/ocaml | |
| parent | 5dc759afec451ae04750706c5f84c75626de23d2 (diff) | |
| download | nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar.gz nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar.bz2 nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar.lz nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar.xz nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.tar.zst nixpkgs-60785fe4dbedc4fd2a4a4980c59357a27b57aabf.zip | |
ocamlPackages.dune: rename into dune_1
Diffstat (limited to 'pkgs/build-support/ocaml')
| -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 f9f59b21510..56fe8a60484 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 |