Merge pull request #279039 from wegank/mingw-w64-bump
windows.mingw_w64: 10.0.0 -> 11.0.1
This commit is contained in:
commit
b5a8242f93
@ -321,7 +321,7 @@ stdenv.mkDerivation {
|
|||||||
hardening_unsupported_flags+=" pic"
|
hardening_unsupported_flags+=" pic"
|
||||||
''
|
''
|
||||||
|
|
||||||
+ optionalString targetPlatform.isAvr ''
|
+ optionalString (targetPlatform.isAvr || targetPlatform.isWindows) ''
|
||||||
hardening_unsupported_flags+=" relro bindnow"
|
hardening_unsupported_flags+=" relro bindnow"
|
||||||
''
|
''
|
||||||
|
|
||||||
|
@ -2,35 +2,20 @@
|
|||||||
, stdenv
|
, stdenv
|
||||||
, windows
|
, windows
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "10.0.0";
|
version = "11.0.1";
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
pname = "mingw-w64";
|
pname = "mingw-w64";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
|
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
|
||||||
hash = "sha256-umtDCu1yxjo3aFMfaj/8Kw/eLFejslFFDc9ImolPCJQ=";
|
hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Upstream patches to fix build parallelism
|
|
||||||
(fetchpatch {
|
|
||||||
name = "crt-suff-make-4.4.patch";
|
|
||||||
url = "https://github.com/mirror/mingw-w64/commit/953bcd32ae470c4647e94de8548dda5a8f07d82d.patch";
|
|
||||||
hash = "sha256-lrS4ZDa/Uwsj5DXajOUv+knZXan0JVU70KHHdIjJ07Y=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "dll-dep-make-4.4.patch";
|
|
||||||
url = "https://github.com/mirror/mingw-w64/commit/e1b0c1420bbd52ef505c71737c57393ac1397b0a.patch";
|
|
||||||
hash = "sha256-/56Cmmy0UYTaDKIWG7CgXsThvCHK6lSbekbBOoOJSIQ=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
Loading…
Reference in New Issue
Block a user