commit e098bea39d9d1c15214aa026bb50893a7459b2b0 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/compilers/gcc/patches/default.nix

···

       224
       224
        
         .${majorVersion} or [ ]

     

       225
       225
        
       )

     

       226
       226
        
       

     

       227
       227
       -
       ++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (fetchpatch {

     

       227
       227
       +
       ++ optional targetPlatform.isCygwin (fetchpatch {

     

       228
       228
        
         name = "libstdc-fix-compilation-in-freestanding-win32.patch";

     

       229
       229
        
         url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-2-corngood@gmail.com/raw";

     

       230
       230
        
         hash = "sha256-+EYW9lG8CviVX7RyNHp+iX+8BRHUjt5b07k940khbbY=";

+13 -8

pkgs/stdenv/generic/make-derivation.nix

···

       706
       706
        
                     __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;

     

       707
       707
        
                   }

     

       708
       708
        
                 )

     

       709
       709
       -
                 // optionalAttrs (isWindows || isCygwin) {

     

       710
       710
       -
                   allowedImpureDLLs =

     

       711
       711
       -
                     allowedImpureDLLs

     

       712
       712
       -
                     ++ lib.optionals isCygwin [

     

       713
       713
       -
                       "KERNEL32.dll"

     

       714
       714
       -
                       "cygwin1.dll"

     

       715
       715
       -
                     ];

     

       716
       716
       -
                 }

     

       709
       709
       +
                 // optionalAttrs (isWindows || isCygwin) (

     

       710
       710
       +
                   let

     

       711
       711
       +
                     dlls =

     

       712
       712
       +
                       allowedImpureDLLs

     

       713
       713
       +
                       ++ lib.optionals isCygwin [

     

       714
       714
       +
                         "KERNEL32.dll"

     

       715
       715
       +
                         "cygwin1.dll"

     

       716
       716
       +
                       ];

     

       717
       717
       +
                   in

     

       718
       718
       +
                   {

     

       719
       719
       +
                     allowedImpureDLLs = if dlls != [ ] then dlls else null;

     

       720
       720
       +
                   }

     

       721
       721
       +
                 )

     

       717
       722
        
                 // (

     

       718
       723
        
                   if !__structuredAttrs then

     

       719
       724
        
                     makeOutputChecks attrs