From 4212967d277e87bd4dc0ae13fdd4ef40059b9b2b Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Fri, 1 Aug 2025 12:18:55 -0400 Subject: [PATCH] windows.mingw_w64_headers: Add libc assert, improve meta block --- pkgs/os-specific/windows/mingw-w64/default.nix | 2 +- pkgs/os-specific/windows/mingw-w64/headers.nix | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index d8103d7b8d37..2ea83e49054b 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ windows.mingw_w64_headers ]; + buildInputs = [ mingw_w64_headers ]; hardeningDisable = [ "stackprotector" "fortify" diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index abcf07bd374e..2cb86651fc86 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -4,7 +4,10 @@ fetchurl, crt ? stdenvNoCC.hostPlatform.libc, }: - +assert lib.assertOneOf "crt" crt [ + "msvcrt" + "ucrt" +]; stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; version = "12.0.0"; @@ -23,9 +26,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = { - downloadPage = "https://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/"; + homepage = "https://www.mingw-w64.org/"; + downloadPage = "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/"; description = "Collection of headers and libraries for building native Windows applications"; - license = lib.licenses.publicDomain; + license = with lib.licenses; [ + # Primarily under + zpl21 + # A couple files + mit + # Certain headers imported from Wine + lgpl21Plus + ]; platforms = lib.platforms.windows; teams = [ lib.teams.windows ]; };