diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb39447c999..f16a7b6691c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -100,7 +100,7 @@ let
   # otherwise the basic overrided packages will not be built with the
   # crossStdenv adapter.
   stdenvOverrides = pkgs:
-    lib.optionalAttrs (pkgs.stdenv ? overrides && crossSystem == null)
+    lib.optionalAttrs (crossSystem == null && pkgs.stdenv ? overrides)
       (pkgs.stdenv.overrides pkgs);
 
   # The un-overriden packages, passed to `overrider'.