diff options
| author | Artturi <Artturin@artturin.com> | 2022-05-13 20:46:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 20:46:33 +0300 |
| commit | 22f6a17b2288d18718ab95a8f4f6b841dd69d9a2 (patch) | |
| tree | dfd3c203f4aaf31fb6991c3495e4aa0d076398d4 /pkgs/stdenv | |
| parent | ab25fc68a20ff183b92810f5166a1697f57a7a7e (diff) | |
| parent | a17e1b8809b5e02e5109209a8a2fc886891d5f7b (diff) | |
Merge pull request #172570 from Artturin/epbbydefault
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cc3a48af2a53..cfed6d197cf0 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; |