diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:57:10 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:57:10 +0200 |
| commit | 484ee79050976cf1d234b4056d16e5bdc152bed6 (patch) | |
| tree | c38b8141426c5714ed7bc5f9e1ffe008c813507f /pkgs/build-support/ocaml | |
| parent | b6474577b04a86a27a555dafa676670fb3902ec8 (diff) | |
| parent | 2111240b9f7e5704045763fbdc66534609a62a65 (diff) | |
| download | nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.gz nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.bz2 nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.lz nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.xz nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.tar.zst nixlib-484ee79050976cf1d234b4056d16e5bdc152bed6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/ocaml')
| -rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 435bbe89c1c4..b134effab8ac 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, dune, dune_2, opaline }: -{ pname, version, buildInputs ? [], ... }@args: +{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in @@ -11,14 +11,16 @@ else stdenv.mkDerivation ({ + inherit enableParallelBuilding; + buildPhase = '' runHook preBuild - dune build -p ${pname} + dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest -p ${pname} + dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' |