From 91718534f1f476a727b51a256c93885e57cf602d Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Sun, 10 Nov 2019 20:02:44 -0500
Subject: [PATCH] lib: Switch to w64 vendor for MinGW

It is needed for the `-municode` flag, supposedly.
---
 lib/systems/examples.nix | 4 ++--
 lib/systems/parse.nix    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 511ae1979485d..585156c247598 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -207,7 +207,7 @@ rec {
 
   # 32 bit mingw-w64
   mingw32 = {
-    config = "i686-pc-mingw32";
+    config = "i686-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
@@ -215,7 +215,7 @@ rec {
   # 64 bit mingw-w64
   mingwW64 = {
     # That's the triplet they use in the mingw-w64 docs.
-    config = "x86_64-pc-mingw32";
+    config = "x86_64-w64-mingw32";
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 5e12df32ffdd2..5a3805cf997a2 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -208,6 +208,9 @@ rec {
   vendors = setTypes types.openVendor {
     apple = {};
     pc = {};
+    # Actually matters, unlocking some MinGW-w64-specific options in GCC. See
+    # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/
+    w64 = {};
 
     none = {};
     unknown = {};