diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 6bbd01da9d2d..c649a493c8ff 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -98,6 +98,7 @@ let "dropAttrs" "dropDerivationAttrs" "keepAttrs" + "enableParallelBuilding" ] ++ dropAttrs ) keepAttrs; @@ -201,7 +202,10 @@ stdenv.mkDerivation ( ); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs); - inherit enableParallelBuilding; + enableParallelBuilding = + lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true) + "mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting" + enableParallelBuilding; meta = ( diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 3411863730c6..fe4f294e81d0 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -92,8 +92,6 @@ let MenhirLib ]; - enableParallelBuilding = true; - postPatch = '' substituteInPlace ./configure \ --replace \$\{toolprefix\}ar 'ar' \ diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index a0f65d94e37c..e7b4662f2c2b 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -68,7 +68,6 @@ mkCoqDerivation rec { ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; - enableParallelBuilding = true; meta = { description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant";