Revert "treewide: undo changes causing rebuilds"

This reverts commit e098bea39d.
2025-09-30 19:05:25 -03:00
parent e098bea39d
commit b8cf634aa1
2 changed files with 9 additions and 14 deletions
@@ -224,7 +224,7 @@ in
  .${majorVersion} or [ ]
 )

-++ optional targetPlatform.isCygwin (fetchpatch {
++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (fetchpatch {
  name = "libstdc-fix-compilation-in-freestanding-win32.patch";
  url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-2-corngood@gmail.com/raw";
  hash = "sha256-+EYW9lG8CviVX7RyNHp+iX+8BRHUjt5b07k940khbbY=";
@@ -706,19 +706,14 @@ let
              __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
            }
          )
-          // optionalAttrs (isWindows || isCygwin) (
-            let
-              dlls =
-                allowedImpureDLLs
-                ++ lib.optionals isCygwin [
-                  "KERNEL32.dll"
-                  "cygwin1.dll"
-                ];
-            in
-            {
-              allowedImpureDLLs = if dlls != [ ] then dlls else null;
-            }
-          )
+          // optionalAttrs (isWindows || isCygwin) {
+            allowedImpureDLLs =
+              allowedImpureDLLs
+              ++ lib.optionals isCygwin [
+                "KERNEL32.dll"
+                "cygwin1.dll"
+              ];
+          }
          // (
            if !__structuredAttrs then
              makeOutputChecks attrs