diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-22 00:03:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 00:03:15 +0000 |
| commit | 30c9243acca5c3872a685037a8e1d2a65f6eb55c (patch) | |
| tree | 1db9e7f70eedd2adebe8b8deba1aee2171321afc /pkgs/stdenv | |
| parent | cea2503d739671fc74ae629c593e8f1bc03e3e35 (diff) | |
| parent | 7060aeb0d84661b81d8a2dbeee13b8828ea2add9 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5f1a22cee06f3..f8a858a4b52de 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -124,7 +124,7 @@ let # InstallCheck phase , doInstallCheck ? config.doCheckByDefault or false -, # TODO(@Ericson2314): Make always true and remove +, # TODO(@Ericson2314): Make always true and remove / resolve #178468 strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform , enableParallelBuilding ? config.enableParallelBuildingByDefault |