public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildDunePackage: add a “useDune2” option

Browse Source
This commit is contained in:
Vincent Laporte
2020-03-23 09:12:50 +01:00
committed by Vincent Laporte
parent 3c4c703368
commit 0229936bbe
8 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/ocaml/dune.nix
+4 -2
View File
@@ -1,7 +1,9 @@
{ stdenv, ocaml, findlib, dune, opaline }:
{ stdenv, ocaml, findlib, dune, dune_2, opaline }:
{ pname, version, buildInputs ? [], ... }@args:
let Dune = if args.useDune2 or false then dune_2 else dune; in
if args ? minimumOCamlVersion &&
! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
@@ -29,7 +31,7 @@ stdenv.mkDerivation ({
name = "ocaml${ocaml.version}-${pname}-${version}";
buildInputs = [ ocaml dune findlib ] ++ buildInputs;
buildInputs = [ ocaml Dune findlib ] ++ buildInputs;
meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; };