diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:53:56 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-01 08:53:56 +0200 |
| commit | 2111240b9f7e5704045763fbdc66534609a62a65 (patch) | |
| tree | ef86be13db80d0e1f9ea853b60e8f4ecb73973d6 /pkgs/build-support/ocaml | |
| parent | bf3870a4c0241e2cb5294fbce5ca9c1932e8db6d (diff) | |
| parent | 635ea98f2f72e801c1d4d35bcc5d7f56e803afec (diff) | |
| download | nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar.gz nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar.bz2 nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar.lz nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar.xz nixlib-2111240b9f7e5704045763fbdc66534609a62a65.tar.zst nixlib-2111240b9f7e5704045763fbdc66534609a62a65.zip | |
Merge master into staging-next
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 = '' |