Unverified Commit 14e44039 authored by seth's avatar seth
Browse files

windows.mingw_w64*: 11.0.1 -> 12.0.0 

Changelog: https://www.mingw-w64.org/changelog/#v1200-2024-05-29

Only notable change for our purposes is UCRT now being the default, so
either it or MSVCRT must be explicitly passed
parent 613a1daf

pkgs/os-specific/windows/mingw-w64/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -4,8 +4,14 @@ 
  windows,

  autoreconfHook,

  mingw_w64_headers,

  crt ? stdenv.hostPlatform.libc,

}:



assert lib.assertOneOf "crt" crt [

  "msvcrt"

  "ucrt"

];



stdenv.mkDerivation {

  pname = "mingw-w64";

  inherit (mingw_w64_headers) version src meta;
@@ -18,7 +24,8 @@ stdenv.mkDerivation { 
  configureFlags = [

    "--enable-idl"

    "--enable-secure-api"

  ] ++ lib.optionals (stdenv.targetPlatform.libc == "ucrt") [ "--with-default-msvcrt=ucrt" ];

    "--with-default-msvcrt=${crt}"

  ];



  enableParallelBuilding = true;

pkgs/os-specific/windows/mingw-w64/headers.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "mingw_w64-headers";

  version = "11.0.1";

  version = "12.0.0";



  src = fetchurl {

    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2";

    hash = "sha256-P2a84Gnui+10OaGhPafLkaXmfqYXDyExesf1eUYl7hA=";

    hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8=";

  };



  preConfigure = ''