diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index f8a858a4b52..bde8735642d 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
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index e9cb8681f65..0ab29d85163 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -50,6 +50,10 @@ let
feature = "set enableParallelBuilding to true by default";
};
+ configurePlatformsByDefault = mkMassRebuild {
+ feature = "set configurePlatforms to [\"build\" \"host\"] by default";
+ };
+
contentAddressedByDefault = mkMassRebuild {
feature = "set __contentAddressed to true by default";
};