3 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix
index 074157c182c38..a88d802c5cf79 100644
--- a/pkgs/os-specific/windows/cygwin-setup/default.nix
+++ b/pkgs/os-specific/windows/cygwin-setup/default.nix
@@ -2,8 +2,6 @@
 , zlib, bzip2, xz, libgcrypt
 }:
 
-with lib;
-
 stdenv.mkDerivation rec {
   pname = "cygwin-setup";
   version = "20131101";
@@ -18,9 +16,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool flex bison pkg-config ];
 
   buildInputs = let
-    mkStatic = flip overrideDerivation (o: {
+    mkStatic = lib.flip lib.overrideDerivation (o: {
       dontDisableStatic = true;
-      configureFlags = toList (o.configureFlags or []) ++ [ "--enable-static" ];
+      configureFlags = lib.toList (o.configureFlags or []) ++ [ "--enable-static" ];
       buildInputs = map mkStatic (o.buildInputs or []);
       propagatedBuildInputs = map mkStatic (o.propagatedBuildInputs or []);
     });
@@ -41,6 +39,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sourceware.org/cygwin-apps/setup.html";
     description = "Tool for installing Cygwin";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 234abcde16117..7b9bbcc52f791 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPackages
-, newScope, overrideCC, crossLibcStdenv, libcCross
+, newScope, overrideCC, stdenvNoLibc, libcCross
 }:
 
 lib.makeScope newScope (self: with self; {
@@ -14,11 +14,11 @@ lib.makeScope newScope (self: with self; {
   mingw_runtime = mingwrt;
 
   mingw_w64 = callPackage ./mingw-w64 {
-    stdenv = crossLibcStdenv;
+    stdenv = stdenvNoLibc;
   };
 
   # FIXME untested with llvmPackages_16 was using llvmPackages_8
-  crossThreadsStdenv = overrideCC crossLibcStdenv
+  crossThreadsStdenv = overrideCC stdenvNoLibc
     (if stdenv.hostPlatform.useLLVM or false
      then buildPackages.llvmPackages.clangNoLibcxx
      else buildPackages.gccWithoutTargetLibc.override (old: {
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index da0fe569a4800..b17d839554f5b 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     description = "POSIX threads library for Windows";
     homepage = "https://sourceware.org/pthreads-win32";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ yana ];
+    maintainers = [ ];
     platforms = platforms.windows;
   };
 }