3
0
Fork 0
forked from mirrors/nixpkgs

mingw-w64: 5.0.4 -> 6.0.0

Version 6.0.0 brings better Win32 API coverage and bugfixes.
It's been used in various distros long enough to be considered stable.
Latest version 7.0.0 hasn't received extensive testing yet.

Announce mail:
https://sourceforge.net/p/mingw-w64/mailman/message/36416777/
This commit is contained in:
Dmitry Kozlyuk 2020-05-19 00:08:57 +03:00 committed by Alyssa Ross
parent ca9265c140
commit 8b89e0494c
3 changed files with 2 additions and 19 deletions

View file

@ -1,14 +1,14 @@
{ stdenv, windows, fetchurl }:
let
version = "5.0.4";
version = "6.0.0";
in stdenv.mkDerivation {
pname = "mingw-w64";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0";
};
outputs = [ "out" "dev" ];
@ -23,7 +23,6 @@ in stdenv.mkDerivation {
buildInputs = [ windows.mingw_w64_headers ];
dontStrip = true;
hardeningDisable = [ "stackprotector" "fortify" ];
patches = [ ./osvi.patch ];
meta = {
platforms = stdenv.lib.platforms.windows;

View file

@ -4,8 +4,6 @@ stdenvNoCC.mkDerivation {
name = "${mingw_w64.name}-headers";
inherit (mingw_w64) src meta;
patches = [ ./osvi.patch ];
preConfigure = ''
cd mingw-w64-headers
'';

View file

@ -1,14 +0,0 @@
Fix `error: osvi undeclared (first use in this function)' issue.
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064
--- 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);
}