mingw: add osvi.patch
This is apparently a typo that has not been fixed. Also remove unused configureFlags.
This commit is contained in:
parent
9cee386f38
commit
744665e3c4
@ -8,9 +8,4 @@ rec {
|
|||||||
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
|
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
|
||||||
sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
|
sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--enable-idl"
|
|
||||||
"--enable-secure-api"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -5,4 +5,5 @@ stdenv.mkDerivation {
|
|||||||
buildInputs = [ windows.mingw_w64_headers ];
|
buildInputs = [ windows.mingw_w64_headers ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
hardeningDisable = [ "stackprotector" "fortify" ];
|
hardeningDisable = [ "stackprotector" "fortify" ];
|
||||||
|
patches = [ ./osvi.patch ];
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,8 @@ in stdenvNoCC.mkDerivation {
|
|||||||
name = name + "-headers";
|
name = name + "-headers";
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
|
patches = [ ./osvi.patch ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cd mingw-w64-headers
|
cd mingw-w64-headers
|
||||||
'';
|
'';
|
||||||
|
11
pkgs/os-specific/windows/mingw-w64/osvi.patch
Normal file
11
pkgs/os-specific/windows/mingw-w64/osvi.patch
Normal file
@ -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);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user