diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index cc3a48af2a5..cfed6d197cf 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -135,6 +135,8 @@ makeOverlayable (overrideAttrs:
, # TODO(@Ericson2314): Make always true and remove
strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform
+, enableParallelBuilding ? config.enableParallelBuildingByDefault
+
, meta ? {}
, passthru ? {}
, pos ? # position used in error messages and for meta.position
@@ -383,7 +385,7 @@ else let
llvm-config = 'llvm-config-native'
'';
in [ "--cross-file=${crossFile}" ] ++ mesonFlags;
- } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
+ } // lib.optionalAttrs (enableParallelBuilding) {
enableParallelChecking = attrs.enableParallelChecking or true;
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) {
NIX_HARDENING_ENABLE = enabledHardeningOptions;
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index d553b624039..8c15e63e5fb 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -36,6 +36,10 @@ let
feature = "set strictDeps to true by default";
};
+ enableParallelBuildingByDefault = mkMassRebuild {
+ feature = "set enableParallelBuilding to true by default";
+ };
+
contentAddressedByDefault = mkMassRebuild {
feature = "set __contentAddressed to true by default";
};