mingw: add osvi.patch

This is apparently a typo that has not been fixed.

Also remove unused configureFlags.

4 files changed, 14 insertions, 5 deletions

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
index 3f75ef00afed..6a28b9e7abd2 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -8,9 +8,4 @@ rec {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
     sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
   };
-
-  configureFlags = [
-    "--enable-idl"
-    "--enable-secure-api"
-  ];
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 53050435256f..e945f6f7b314 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -5,4 +5,5 @@ stdenv.mkDerivation {
   buildInputs = [ windows.mingw_w64_headers ];
   dontStrip = true;
   hardeningDisable = [ "stackprotector" "fortify" ];
+  patches = [ ./osvi.patch ];
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index 03dbf712e2e5..91ae35583576 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -7,6 +7,8 @@ in stdenvNoCC.mkDerivation {
   name = name + "-headers";
   inherit src;
 
+  patches = [ ./osvi.patch ];
+
   preConfigure = ''
     cd mingw-w64-headers
   '';
diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/pkgs/os-specific/windows/mingw-w64/osvi.patch
new file mode 100644
index 000000000000..8d82f56d86fe
--- /dev/null
+++ b/pkgs/os-specific/windows/mingw-w64/osvi.patch
@@ -0,0 +1,11 @@
+--- a/mingw-w64-headers/include/multimon.h
++++ b/mingw-w64-headers/include/multimon.h
+@@ -127,7 +127,7 @@
+   WINBOOL IsPlatformNT() {
+     OSVERSIONINFOA oi = { 0 };
+ 
+-    oi.dwOSVersionInfoSize = sizeof (osvi);
++    oi.dwOSVersionInfoSize = sizeof (oi);
+     GetVersionExA ((OSVERSIONINFOA *) &oi);
+     return (oi.dwPlatformId == VER_PLATFORM_WIN32_NT);
+   }
\ No newline at end of file