diff options
Diffstat (limited to 'pkgs/stdenv/generic/make-derivation.nix')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5f1a22cee06f3..bde8735642d8c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -111,9 +111,9 @@ let , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # - # TODO(@Ericson2314): Make [ "build" "host" ] always the default. + # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909 configurePlatforms ? lib.optionals - (stdenv.hostPlatform != stdenv.buildPlatform) + (stdenv.hostPlatform != stdenv.buildPlatform || config.configurePlatformsByDefault) [ "build" "host" ] # TODO(@Ericson2314): Make unconditional / resolve #33599 @@ -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 |