diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index e47e31a1b5f2..950121d5e172 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -12,7 +12,7 @@
 }:
 
 let
-  versions = import ./versions.nix;
+  versions = import ./versions.nix { inherit stdenv; };
   buildIsHost = lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform;
   buildIsTarget = lib.systems.equals stdenv.buildPlatform stdenv.targetPlatform;
   hostIsTarget = lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform;
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 615cd2b3b19a..f2754e477a0e 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -78,7 +78,7 @@ let
 
   inherit (_systemInfo) buildIsHost hostIsTarget;
 
-  gccVersions = import ./versions.nix;
+  gccVersions = import ./versions.nix { inherit stdenv; };
   version = gccVersions.fromMajorMinor majorMinorVersion;
 
   majorVersion = versions.major version;
diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix
index 362e24dd2029..4fd8b8f77b56 100644
--- a/pkgs/development/compilers/gcc/versions.nix
+++ b/pkgs/development/compilers/gcc/versions.nix
@@ -1,7 +1,8 @@
+{ stdenv }:
 let
   majorMinorToVersionMap = {
     "16" = "16.2.0";
-    "15" = "15.3.0";
+    "15" = if stdenv.hostPlatform.isi686 then "15.2.0" else "15.3.0";
     "14" = "14.4.0";
     "13" = "13.4.0";
   };
@@ -16,6 +17,7 @@ let
       # 4 digits: snapshots (14.2.1.20250322)
       "16.2.0" = "sha256-5nOOKVl/czJwcxqpBgDzf/3ARQed/CfsfoGSzIEIXD4=";
       "15.3.0" = "sha256-+lnBvu+JlfJ8TXHB3yJ1hxiTFdPm+v8btDBuYbDFMOs=";
+      "15.2.0" = "sha256-Q4/ZloJrDIJIWinaA6ctcdbjVBqD7HAt9Ccfb+Al0k4=";
       "14.4.0" = "sha256-dStvVnvqyDFZx3p2gLExa914Rzi/+anQcBEsCdqQ9tk=";
       "13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
     }