windows: Various clean-ups (#430163)

pkgs/by-name/li/libpfm/package.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
   env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx;
+  buildInputs = lib.optional stdenv.hostPlatform.isMinGW windows.libgnurx;
 
   meta = with lib; {
     description = "Helper library to program the performance monitoring events";

pkgs/os-specific/windows/libgnurx/default.nix

@@ -3,16 +3,13 @@
   stdenv,
   fetchurl,
 }:
-
-let
-  version = "2.5.1";
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libgnurx";
-  inherit version;
+  version = "2.5.1";
+
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz";
-    sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
+    url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${finalAttrs.version}/mingw-libgnurx-${finalAttrs.version}-src.tar.gz";
+    hash = "sha256-cUe3+AbsPQB4Q7OOGfQqW3xliUpX/8KXp2sNzV9nXXY=";
   };
 
   # file looks for libgnurx.a when compiling statically
@@ -27,4 +24,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.windows;
     teams = [ lib.teams.windows ];
   };
-}
+})

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"

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 ];
   };

pkgs/os-specific/windows/pthread-w32/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz";
-    sha256 = "1s8iny7g06z289ahdj0kzaxj0cd3wvjbd8j3bh9xlg7g444lhy9w";
+    hash = "sha256-PHlICSHvPNoTXEOituTmozEgu/oTyAZVQuIb8I63Eek=";
   };
 
   makeFlags = [

pkgs/tools/misc/file/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateAutotoolsGnuConfigScriptsHook
   ]
   ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
-  buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
+  buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW libgnurx;
 
   # https://bugs.astron.com/view.php?id=382
   doCheck = !stdenv.buildPlatform.isMusl;