diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 90f67b3916fb0..9d37293cdc8cb 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -108,6 +108,9 @@ let
     "aarch64-windows"
     "x86_64-windows"
     "i686-windows"
+    "x86_64-mingw"
+    "i686-mingw"
+    "aarch64-mingw"
   ];
 
   allParsed = map parse.mkSystemFromString all;
@@ -187,6 +190,8 @@ in
   wasi = filterDoubles predicates.isWasi;
   redox = filterDoubles predicates.isRedox;
   windows = filterDoubles predicates.isWindows;
+  mingw = filterDoubles predicates.isMinGW;
+  msvc = filterDoubles predicates.isMsvc;
   genode = filterDoubles predicates.isGenode;
 
   embedded = filterDoubles predicates.isNone;
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 0dfd91b7bb76b..da6f5fff1d7b6 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -798,6 +798,12 @@ rec {
             kernel = "windows";
             abi = "msvc";
           }
+        else if elemAt l 1 == "mingw" then
+          {
+            cpu = elemAt l 0;
+            kernel = "windows";
+            abi = "gnu";
+          }
         else if (elemAt l 1) == "elf" then
           {
             cpu = elemAt l 0;
@@ -935,6 +941,8 @@ rec {
     }:
     if abi == abis.cygnus then
       "${cpu.name}-cygwin"
+    else if kernel == kernels.windows && abi == abis.gnu then
+      "${cpu.name}-mingw"
     else if kernel.families ? darwin then
       "${cpu.name}-darwin"
     else
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index c67a52ef93be3..d8ce444d23906 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     downloadPage = "https://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/";
     description = "Regex functionality from glibc extracted into a separate library for win32";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.windows;
+    platforms = lib.platforms.mingw;
     teams = [ lib.teams.windows ];
   };
 }
diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 11ec8db387973..287aff0178f2c 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lhmouse/mcfgthread/wiki";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ wegank ];
-    platforms = lib.platforms.windows;
+    platforms = lib.platforms.mingw;
   };
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index abcf07bd374e4..f038a5fc01e91 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     downloadPage = "https://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/";
     description = "Collection of headers and libraries for building native Windows applications";
     license = lib.licenses.publicDomain;
-    platforms = lib.platforms.windows;
+    platforms = lib.platforms.mingw;
     teams = [ lib.teams.windows ];
   };
 })