public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Switch to w64 vendor for MinGW 

It is needed for the `-municode` flag, supposedly.
This commit is contained in:
John Ericson 2019-11-10 20:02:44 -05:00
parent 38ebb8ff82
commit 91718534f1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/systems/examples.nix
View File

@ -207,7 +207,7 @@ rec {
# 32 bit mingw-w64 # 32 bit mingw-w64
mingw32 = { mingw32 = {
config = "i686-pc-mingw32"; config = "i686-w64-mingw32";
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {}; platform = {};
}; };
@ -215,7 +215,7 @@ rec {
# 64 bit mingw-w64 # 64 bit mingw-w64
mingwW64 = { mingwW64 = {
# That's the triplet they use in the mingw-w64 docs. # 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 libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {}; platform = {};
}; };

3
lib/systems/parse.nix
View File

@ -208,6 +208,9 @@ rec {
vendors = setTypes types.openVendor { vendors = setTypes types.openVendor {
apple = {}; apple = {};
pc = {}; 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 = {}; none = {};
unknown = {}; unknown = {};