treewide: undo changes causing rebuilds

Changed files
+14 -9
pkgs
development
compilers
gcc
patches
stdenv
+1 -1
pkgs/development/compilers/gcc/patches/default.nix
···
.${majorVersion} or [ ]
)
-
++ 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=";
···
.${majorVersion} or [ ]
)
+
++ optional 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=";
+13 -8
pkgs/stdenv/generic/make-derivation.nix
···
__propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
}
)
-
// optionalAttrs (isWindows || isCygwin) {
-
allowedImpureDLLs =
-
allowedImpureDLLs
-
++ lib.optionals isCygwin [
-
"KERNEL32.dll"
-
"cygwin1.dll"
-
];
-
}
// (
if !__structuredAttrs then
makeOutputChecks attrs
···
__propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
}
)
+
// optionalAttrs (isWindows || isCygwin) (
+
let
+
dlls =
+
allowedImpureDLLs
+
++ lib.optionals isCygwin [
+
"KERNEL32.dll"
+
"cygwin1.dll"
+
];
+
in
+
{
+
allowedImpureDLLs = if dlls != [ ] then dlls else null;
+
}
+
)
// (
if !__structuredAttrs then
makeOutputChecks attrs