From a17e1b8809b5e02e5109209a8a2fc886891d5f7b Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 11 May 2022 16:41:30 +0300 Subject: [PATCH] config.enableParallelBuildingByDefault: init option useful for testing if some builds could be faster --- pkgs/stdenv/generic/make-derivation.nix | 4 +++- pkgs/top-level/config.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 88450328ca7..64415c62efd 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 @@ -377,7 +379,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"; };