git.iko.soy/typeable/nixpkgs
on master help sign in
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/

commit8b89e0494c5afc511df5463a413c340b43f73ca9 authorDmitry Kozlyuk <dmitry.kozliuk@gmail.com> dateTue 19 May 2020, 00:08 (7 years ago) parentca9265c
3 files changed+2−19
pkgs/os-specific/windows/mingw-w64/default.nix+2−3 pkgs/os-specific/windows/mingw-w64/headers.nix−2 pkgs/os-specific/windows/mingw-w64/osvi.patch−14
pkgs/os-specific/windows/mingw-w64/default.nix+2−3
@@ -1,14 +1,14 @@
11{ stdenv, windows, fetchurl }:
22
33let
4− version = "5.0.4";
4+ version = "6.0.0";
55in stdenv.mkDerivation {
66 pname = "mingw-w64";
77 inherit version;
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
11− sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
11+ sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0";
1212 };
1313
1414 outputs = [ "out" "dev" ];
@@ -23,7 +23,6 @@ in stdenv.mkDerivation {
2323 buildInputs = [ windows.mingw_w64_headers ];
2424 dontStrip = true;
2525 hardeningDisable = [ "stackprotector" "fortify" ];
26− patches = [ ./osvi.patch ];
2726
2827 meta = {
2928 platforms = stdenv.lib.platforms.windows;
pkgs/os-specific/windows/mingw-w64/headers.nix−2
@@ -4,8 +4,6 @@ stdenvNoCC.mkDerivation {
44 name = "${mingw_w64.name}-headers";
55 inherit (mingw_w64) src meta;
66
7− patches = [ ./osvi.patch ];
8−
97 preConfigure = ''
108 cd mingw-w64-headers
119 '';
pkgs/os-specific/windows/mingw-w64/osvi.patchdeleted−14
@@ -1,14 +0,0 @@
1−Fix `error: osvi undeclared (first use in this function)' issue.
2−
3−See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064
4−--- a/mingw-w64-headers/include/multimon.h
5−+++ b/mingw-w64-headers/include/multimon.h
6−@@ -127,7 +127,7 @@
7− WINBOOL IsPlatformNT() {
8− OSVERSIONINFOA oi = { 0 };
9−
10−- oi.dwOSVersionInfoSize = sizeof (osvi);
11−+ oi.dwOSVersionInfoSize = sizeof (oi);
12− GetVersionExA ((OSVERSIONINFOA *) &oi);
13− return (oi.dwPlatformId == VER_PLATFORM_WIN32_NT);
14− }