commit 941a243895317ebac68794b5ec5c8936d48b6eea · pyrox.dev/nixpkgs

+6 -3

lib/systems/default.nix

···

       124
        
                   "ucrt"

     

       125
        
                 else if final.isMinGW then

     

       126
        
                   "msvcrt"

     

       0
        
       
     

       0
        
       
     

       127
        
                 else if final.isWasi then

     

       128
        
                   "wasilibc"

     

       129
        
                 else if final.isWasm && !final.isWasi then

     
···

       183
        
                   sharedLibrary =

     

       184
        
                     if final.isDarwin then

     

       185
        
                       ".dylib"

     

       186
       -
                     else if final.isWindows then

     

       187
        
                       ".dll"

     

       188
        
                     else

     

       189
        
                       ".so";

     
···

       191
        
                 // {

     

       192
        
                   staticLibrary = if final.isWindows then ".lib" else ".a";

     

       193
        
                   library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary;

     

       194
       -
                   executable = if final.isWindows then ".exe" else "";

     

       195
        
                 };

     

       196
        
               # Misc boolean options

     

       197
        
               useAndroidPrebuilt = false;

     
···

       204
        
                   {

     

       205
        
                     linux = "Linux";

     

       206
        
                     windows = "Windows";

     

       0
        
       
     

       207
        
                     darwin = "Darwin";

     

       208
        
                     netbsd = "NetBSD";

     

       209
        
                     freebsd = "FreeBSD";

     
···

       603
        
                     "openbsd"

     

       604
        
                   else if final.isSunOS then

     

       605
        
                     "sunos"

     

       606
       -
                   else if final.isWindows then

     

       607
        
                     "win32"

     

       608
        
                   else

     

       609
        
                     null;

···

       124
        
                   "ucrt"

     

       125
        
                 else if final.isMinGW then

     

       126
        
                   "msvcrt"

     

       127
       +
                 else if final.isCygwin then

     

       128
       +
                   "cygwin"

     

       129
        
                 else if final.isWasi then

     

       130
        
                   "wasilibc"

     

       131
        
                 else if final.isWasm && !final.isWasi then

     
···

       185
        
                   sharedLibrary =

     

       186
        
                     if final.isDarwin then

     

       187
        
                       ".dylib"

     

       188
       +
                     else if (final.isWindows || final.isCygwin) then

     

       189
        
                       ".dll"

     

       190
        
                     else

     

       191
        
                       ".so";

     
···

       193
        
                 // {

     

       194
        
                   staticLibrary = if final.isWindows then ".lib" else ".a";

     

       195
        
                   library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary;

     

       196
       +
                   executable = if (final.isWindows || final.isCygwin) then ".exe" else "";

     

       197
        
                 };

     

       198
        
               # Misc boolean options

     

       199
        
               useAndroidPrebuilt = false;

     
···

       206
        
                   {

     

       207
        
                     linux = "Linux";

     

       208
        
                     windows = "Windows";

     

       209
       +
                     cygwin = "CYGWIN_NT";

     

       210
        
                     darwin = "Darwin";

     

       211
        
                     netbsd = "NetBSD";

     

       212
        
                     freebsd = "FreeBSD";

     
···

       606
        
                     "openbsd"

     

       607
        
                   else if final.isSunOS then

     

       608
        
                     "sunos"

     

       609
       +
                   else if (final.isWindows || final.isCygwin) then

     

       610
        
                     "win32"

     

       611
        
                   else

     

       612
        
                     null;

lib/systems/examples.nix

···

       388
        
           useLLVM = true;

     

       389
        
         };

     

       390
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       391
        
         # BSDs

     

       392
        
       

     

       393
        
         aarch64-freebsd = {

···

       388
        
           useLLVM = true;

     

       389
        
         };

     

       390
        
       

     

       391
       +
         x86_64-cygwin = {

     

       392
       +
           config = "x86_64-pc-cygwin";

     

       393
       +
         };

     

       394
       +
       

     

       395
        
         # BSDs

     

       396
        
       

     

       397
        
         aarch64-freebsd = {

+1 -2

lib/systems/inspect.nix

···

       337
        
             kernel = kernels.windows;

     

       338
        
           };

     

       339
        
           isCygwin = {

     

       340
       -
             kernel = kernels.windows;

     

       341
       -
             abi = abis.cygnus;

     

       342
        
           };

     

       343
        
           isMinGW = {

     

       344
        
             kernel = kernels.windows;

···

       337
        
             kernel = kernels.windows;

     

       338
        
           };

     

       339
        
           isCygwin = {

     

       340
       +
             kernel = kernels.cygwin;

     

       0
        
       
     

       341
        
           };

     

       342
        
           isMinGW = {

     

       343
        
             kernel = kernels.windows;

+19 -13

lib/systems/parse.nix

···

       42
        
           isLinux

     

       43
        
           isPower64

     

       44
        
           isWindows

     

       0
        
       
     

       45
        
           ;

     

       46
        
       

     

       47
        
         inherit (lib.types)

     
···

       617
        
               execFormat = pe;

     

       618
        
               families = { };

     

       619
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       620
        
             ghcjs = {

     

       621
        
               execFormat = unknown;

     

       622
        
               families = { };

     
···

       650
        
         types.abi = enum (attrValues abis);

     

       651
        
       

     

       652
        
         abis = setTypes types.openAbi {

     

       653
       -
           cygnus = { };

     

       654
        
           msvc = { };

     

       655
        
       

     

       656
        
           # Note: eabi is specific to ARM and PowerPC.

     
···

       783
        
                 throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous";

     

       784
        
             "2" = # We only do 2-part hacks for things Nix already supports

     

       785
        
               if elemAt l 1 == "cygwin" then

     

       786
       -
                 {

     

       787
       -
                   cpu = elemAt l 0;

     

       788
       -
                   kernel = "windows";

     

       789
       -
                   abi = "cygnus";

     

       790
       -
                 }

     

       791
        
               # MSVC ought to be the default ABI so this case isn't needed. But then it

     

       792
        
               # becomes difficult to handle the gnu* variants for Aarch32 correctly for

     

       793
        
               # minGW. So it's easier to make gnu* the default for the MinGW, but

     
···

       851
        
                     else

     

       852
        
                       elemAt l 2;

     

       853
        
                 }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       854
        
               else

     

       855
        
                 throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous";

     

       856
        
             "4" = {

     
···

       891
        
                   getVendor args.vendor

     

       892
        
                 else if isDarwin parsed then

     

       893
        
                   vendors.apple

     

       894
       -
                 else if isWindows parsed then

     

       895
        
                   vendors.pc

     

       896
        
                 else

     

       897
        
                   vendors.unknown;

     
···

       933
        
             abi,

     

       934
        
             ...

     

       935
        
           }:

     

       936
       -
           if abi == abis.cygnus then

     

       937
       -
             "${cpu.name}-cygwin"

     

       938
       -
           else if kernel.families ? darwin then

     

       939
       -
             "${cpu.name}-darwin"

     

       940
       -
           else

     

       941
       -
             "${cpu.name}-${kernelName kernel}";

     

       942
        
       

     

       943
        
         tripleFromSystem =

     

       944
        
           {

···

       42
        
           isLinux

     

       43
        
           isPower64

     

       44
        
           isWindows

     

       45
       +
           isCygwin

     

       46
        
           ;

     

       47
        
       

     

       48
        
         inherit (lib.types)

     
···

       618
        
               execFormat = pe;

     

       619
        
               families = { };

     

       620
        
             };

     

       621
       +
             cygwin = {

     

       622
       +
               execFormat = pe;

     

       623
       +
               families = { };

     

       624
       +
             };

     

       625
        
             ghcjs = {

     

       626
        
               execFormat = unknown;

     

       627
        
               families = { };

     
···

       655
        
         types.abi = enum (attrValues abis);

     

       656
        
       

     

       657
        
         abis = setTypes types.openAbi {

     

       0
        
       
     

       658
        
           msvc = { };

     

       659
        
       

     

       660
        
           # Note: eabi is specific to ARM and PowerPC.

     
···

       787
        
                 throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous";

     

       788
        
             "2" = # We only do 2-part hacks for things Nix already supports

     

       789
        
               if elemAt l 1 == "cygwin" then

     

       790
       +
                 mkSkeletonFromList [

     

       791
       +
                   (elemAt l 0)

     

       792
       +
                   "pc"

     

       793
       +
                   "cygwin"

     

       794
       +
                 ]

     

       795
        
               # MSVC ought to be the default ABI so this case isn't needed. But then it

     

       796
        
               # becomes difficult to handle the gnu* variants for Aarch32 correctly for

     

       797
        
               # minGW. So it's easier to make gnu* the default for the MinGW, but

     
···

       855
        
                     else

     

       856
        
                       elemAt l 2;

     

       857
        
                 }

     

       858
       +
               # lots of tools expect a triplet for Cygwin, even though the vendor is just "pc"

     

       859
       +
               else if elemAt l 2 == "cygwin" then

     

       860
       +
                 {

     

       861
       +
                   cpu = elemAt l 0;

     

       862
       +
                   vendor = elemAt l 1;

     

       863
       +
                   kernel = "cygwin";

     

       864
       +
                 }

     

       865
        
               else

     

       866
        
                 throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous";

     

       867
        
             "4" = {

     
···

       902
        
                   getVendor args.vendor

     

       903
        
                 else if isDarwin parsed then

     

       904
        
                   vendors.apple

     

       905
       +
                 else if (isWindows parsed || isCygwin parsed) then

     

       906
        
                   vendors.pc

     

       907
        
                 else

     

       908
        
                   vendors.unknown;

     
···

       944
        
             abi,

     

       945
        
             ...

     

       946
        
           }:

     

       947
       +
           if kernel.families ? darwin then "${cpu.name}-darwin" else "${cpu.name}-${kernelName kernel}";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       948
        
       

     

       949
        
         tripleFromSystem =

     

       950
        
           {

+1 -2

lib/tests/systems.nix

···

       49
        
             ++ illumos

     

       50
        
             ++ wasi

     

       51
        
             ++ windows

     

       0
        
       
     

       52
        
             ++ embedded

     

       53
        
             ++ mmix

     

       54
        
             ++ js

     
···

       202
        
             "x86_64-openbsd"

     

       203
        
           ];

     

       204
        
           testwindows = mseteq windows [

     

       205
       -
             "i686-cygwin"

     

       206
       -
             "x86_64-cygwin"

     

       207
        
             "aarch64-windows"

     

       208
        
             "i686-windows"

     

       209
        
             "x86_64-windows"

···

       49
        
             ++ illumos

     

       50
        
             ++ wasi

     

       51
        
             ++ windows

     

       52
       +
             ++ cygwin

     

       53
        
             ++ embedded

     

       54
        
             ++ mmix

     

       55
        
             ++ js

     
···

       203
        
             "x86_64-openbsd"

     

       204
        
           ];

     

       205
        
           testwindows = mseteq windows [

     

       0
        
       
     

       0
        
       
     

       206
        
             "aarch64-windows"

     

       207
        
             "i686-windows"

     

       208
        
             "x86_64-windows"

pkgs/build-support/bintools-wrapper/default.nix

···

       346
        
                 }

     

       347
        
               fi

     

       348
        
             ''

     

       349
       +
             + optionalString (libc.w32api or null != null) ''

     

       350
       +
               echo '-L${lib.getLib libc.w32api}${libc.libdir or "/lib/w32api"}' >> $out/nix-support/libc-ldflags

     

       351
       +
             ''

     

       352
        
           )

     

       353
        
       

     

       354
        
           ##

+18 -6

pkgs/build-support/cc-wrapper/default.nix

···

       126
        
         libc_dev = optionalString (libc != null) (getDev libc);

     

       127
        
         libc_lib = optionalString (libc != null) (getLib libc);

     

       128
        
         cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       0
        
       
     

       129
        
       

     

       130
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       131
        
         coreutils_bin = optionalString (!nativeTools) (getBin coreutils);

     
···

       590
        
         ]

     

       591
        
         ++ optional (cc.langC or true) ./setup-hook.sh

     

       592
        
         ++ optional (cc.langFortran or false) ./fortran-hook.sh

     

       593
       -
         ++ optional (targetPlatform.isWindows) (

     

       594
        
           stdenvNoCC.mkDerivation {

     

       595
        
             name = "win-dll-hook.sh";

     

       596
        
             dontUnpack = true;

     

       597
       -
             installPhase = ''

     

       598
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out

     

       599
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out

     

       600
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out

     

       601
       -
             '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       602
        
           }

     

       603
        
         );

     

       604
        
       

     
···

       704
        
               for dir in "${cc}"/lib/gcc/*/*/include-fixed; do

     

       705
        
                 include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags

     

       706
        
               done

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       707
        
             ''

     

       708
        
             + ''

     

       709

···

       126
        
         libc_dev = optionalString (libc != null) (getDev libc);

     

       127
        
         libc_lib = optionalString (libc != null) (getLib libc);

     

       128
        
         cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       129
       +
         cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       130
        
       

     

       131
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       132
        
         coreutils_bin = optionalString (!nativeTools) (getBin coreutils);

     
···

       591
        
         ]

     

       592
        
         ++ optional (cc.langC or true) ./setup-hook.sh

     

       593
        
         ++ optional (cc.langFortran or false) ./fortran-hook.sh

     

       594
       +
         ++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (

     

       595
        
           stdenvNoCC.mkDerivation {

     

       596
        
             name = "win-dll-hook.sh";

     

       597
        
             dontUnpack = true;

     

       598
       +
             installPhase =

     

       599
       +
               if targetPlatform.isCygwin then

     

       600
       +
                 ''

     

       601
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out

     

       602
       +
                 ''

     

       603
       +
               else

     

       604
       +
                 ''

     

       605
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out

     

       606
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out

     

       607
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out

     

       608
       +
                 '';

     

       609
        
           }

     

       610
        
         );

     

       611
        
       

     
···

       711
        
               for dir in "${cc}"/lib/gcc/*/*/include-fixed; do

     

       712
        
                 include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags

     

       713
        
               done

     

       714
       +
             ''

     

       715
       +
             + optionalString (libc.w32api or null != null) ''

     

       716
       +
               echo '-idirafter ${lib.getDev libc.w32api}${

     

       717
       +
                 libc.incdir or "/include/w32api"

     

       718
       +
               }' >> $out/nix-support/libc-cflags

     

       719
        
             ''

     

       720
        
             + ''

     

       721

+73

pkgs/build-support/setup-hooks/cygwin-dll-link.sh

···

       1
       +
       addLinkDLLPaths() {

     

       2
       +
           addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"

     

       3
       +
           addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"

     

       4
       +
       }

     

       5
       +
       

     

       6
       +
       addEnvHooks "$targetOffset" addLinkDLLPaths

     

       7
       +
       

     

       8
       +
       addOutputDLLPaths() {

     

       9
       +
         for output in $(getAllOutputNames); do

     

       10
       +
           addToSearchPath "LINK_DLL_FOLDERS" "${!output}/lib"

     

       11
       +
           addToSearchPath "LINK_DLL_FOLDERS" "${!output}/bin"

     

       12
       +
         done

     

       13
       +
       }

     

       14
       +
       

     

       15
       +
       postInstallHooks+=(addOutputDLLPaths)

     

       16
       +
       

     

       17
       +
       _dllDeps() {

     

       18
       +
           "$OBJDUMP" -p "$1" \

     

       19
       +
               | sed -n 's/.*DLL Name: \(.*\)/\1/p' \

     

       20
       +
               | sort -u

     

       21
       +
       }

     

       22
       +
       

     

       23
       +
       _linkDeps() {

     

       24
       +
           local target="$1" dir="$2" check="$3"

     

       25
       +
           echo 'target:' "$target"

     

       26
       +
           local dll

     

       27
       +
           _dllDeps "$target" | while read dll; do

     

       28
       +
               echo '  dll:' "$dll"

     

       29
       +
               if [[ -e "$dir/$dll" ]]; then continue; fi

     

       30
       +
               # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS.

     

       31
       +
               local dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"

     

       32
       +
               if [[ -z "$dllPath" ]]; then

     

       33
       +
                 if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then

     

       34
       +
                    continue

     

       35
       +
                 fi

     

       36
       +
                 echo unable to find $dll in $LINK_DLL_FOLDERS >&2

     

       37
       +
                 exit 1

     

       38
       +
               fi

     

       39
       +
               echo '    linking to:' "$dllPath"

     

       40
       +
               CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir"

     

       41
       +
               # That DLL might have its own (transitive) dependencies,

     

       42
       +
               # so add also all DLLs from its directory to be sure.

     

       43
       +
               _linkDeps "$dllPath" "$dir" ""

     

       44
       +
           done

     

       45
       +
       }

     

       46
       +
       

     

       47
       +
       linkDLLs() {

     

       48
       +
         if [ ! -d "$prefix" ]; then return; fi

     

       49
       +
         (

     

       50
       +
           set -e

     

       51
       +
           shopt -s globstar nullglob

     

       52
       +
       

     

       53
       +
           local -a allowedImpureDLLsArray

     

       54
       +
           concatTo allowedImpureDLLsArray allowedImpureDLLs

     

       55
       +
       

     

       56
       +
           local -A allowedImpureDLLsMap;

     

       57
       +
       

     

       58
       +
           for dll in "${allowedImpureDLLsArray[@]}"; do

     

       59
       +
             allowedImpureDLLsMap[$dll]=1

     

       60
       +
           done

     

       61
       +
       

     

       62
       +
           cd "$prefix"

     

       63
       +
       

     

       64
       +
           # Iterate over any DLL that we depend on.

     

       65
       +
           local target

     

       66
       +
           for target in {bin,libexec}/**/*.{exe,dll}; do

     

       67
       +
             [[ ! -f "$target" || ! -x "$target" ]] ||

     

       68
       +
               _linkDeps "$target" "$(dirname "$target")" "1"

     

       69
       +
           done

     

       70
       +
         )

     

       71
       +
       }

     

       72
       +
       

     

       73
       +
       fixupOutputHooks+=(linkDLLs)

+43

pkgs/by-name/co/cocom-tool-set/package.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenv,

     

       4
       +
         fetchurl,

     

       5
       +
         autoreconfHook,

     

       6
       +
         bison,

     

       7
       +
       }:

     

       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       +
         pname = "cocom";

     

       10
       +
         version = "0.996";

     

       11
       +
       

     

       12
       +
         src = fetchurl {

     

       13
       +
           url = "mirror://sourceforge/cocom/cocom-${finalAttrs.version}.tar.gz";

     

       14
       +
           hash = "sha256-4UOrVW15o17zHsHiQIl8m4qNC2aT5QorbkfX/UsgBRk=";

     

       15
       +
         };

     

       16
       +
       

     

       17
       +
         env = {

     

       18
       +
           RANLIB = "${stdenv.cc.targetPrefix}gcc-ranlib";

     

       19
       +
           NIX_CFLAGS_COMPILE = toString [

     

       20
       +
             "-Wno-error=implicit-int"

     

       21
       +
             "-Wno-error=implicit-function-declaration"

     

       22
       +
           ];

     

       23
       +
         };

     

       24
       +
       

     

       25
       +
         autoreconfFlags = "REGEX";

     

       26
       +
       

     

       27
       +
         strictDeps = true;

     

       28
       +
       

     

       29
       +
         nativeBuildInputs = [

     

       30
       +
           autoreconfHook

     

       31
       +
           bison

     

       32
       +
         ];

     

       33
       +
       

     

       34
       +
         hardeningDisable = [ "format" ];

     

       35
       +
       

     

       36
       +
         meta = {

     

       37
       +
           description = "Tool set oriented towards the creation of compilers";

     

       38
       +
           homepage = "https://cocom.sourceforge.net/";

     

       39
       +
           license = lib.licenses.gpl2Plus;

     

       40
       +
           maintainers = with lib.maintainers; [ puffnfresh ];

     

       41
       +
           platforms = lib.platforms.unix;

     

       42
       +
         };

     

       43
       +
       })

+1 -1

pkgs/development/compilers/gcc/common/configure-flags.nix

···

       258
        
           ++ lib.optional (

     

       259
        
             lib.systems.equals targetPlatform hostPlatform && targetPlatform.isx86_32

     

       260
        
           ) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"

     

       261
       -
           ++ lib.optional targetPlatform.isNetBSD "--disable-libssp" # Provided by libc.

     

       262
        
           ++ lib.optionals hostPlatform.isSunOS [

     

       263
        
             "--enable-long-long"

     

       264
        
             "--enable-libssp"

···

       258
        
           ++ lib.optional (

     

       259
        
             lib.systems.equals targetPlatform hostPlatform && targetPlatform.isx86_32

     

       260
        
           ) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"

     

       261
       +
           ++ lib.optional (targetPlatform.isNetBSD || targetPlatform.isCygwin) "--disable-libssp" # Provided by libc.

     

       262
        
           ++ lib.optionals hostPlatform.isSunOS [

     

       263
        
             "--enable-long-long"

     

       264
        
             "--enable-libssp"

+6 -2

pkgs/development/compilers/gcc/common/extra-target-flags.nix

···

       27
        
                 ]

     

       28
        
               );

     

       29
        
           in

     

       30
       -
           mkFlags libcCross ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null));

     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
         EXTRA_LDFLAGS_FOR_TARGET =

     

       33
        
           let

     
···

       50
        
                 )

     

       51
        
               );

     

       52
        
           in

     

       53
       -
           mkFlags libcCross ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null));

     

       0
        
       
     

       0
        
       
     

       54
        
       }

···

       27
        
                 ]

     

       28
        
               );

     

       29
        
           in

     

       30
       +
           mkFlags libcCross

     

       31
       +
           ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null))

     

       32
       +
           ++ mkFlags (libcCross.w32api or null);

     

       33
        
       

     

       34
        
         EXTRA_LDFLAGS_FOR_TARGET =

     

       35
        
           let

     
···

       52
        
                 )

     

       53
        
               );

     

       54
        
           in

     

       55
       +
           mkFlags libcCross

     

       56
       +
           ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null))

     

       57
       +
           ++ mkFlags (libcCross.w32api or null);

     

       58
        
       }

+4 -1

pkgs/development/compilers/gcc/common/libgcc.nix

···

       53
        
               useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc;

     

       54
        
       

     

       55
        
               enableLibGccOutput =

     

       56
       -
                 (!stdenv.targetPlatform.isWindows || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform))

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       57
        
                 && !langJit

     

       58
        
                 && !stdenv.hostPlatform.isDarwin

     

       59
        
                 && enableShared

···

       53
        
               useLibgccFromTargetLibc = libcCross != null && libcCross ? passthru.libgcc;

     

       54
        
       

     

       55
        
               enableLibGccOutput =

     

       56
       +
                 (

     

       57
       +
                   !(stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isCygwin)

     

       58
       +
                   || (lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform)

     

       59
       +
                 )

     

       60
        
                 && !langJit

     

       61
        
                 && !stdenv.hostPlatform.isDarwin

     

       62
        
                 && enableShared

+14

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

···

       223
        
         }

     

       224
        
         .${majorVersion} or [ ]

     

       225
        
       )

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       223
        
         }

     

       224
        
         .${majorVersion} or [ ]

     

       225
        
       )

     

       226
       +
       

     

       227
       +
       ++ optional targetPlatform.isCygwin (fetchpatch {

     

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

     

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

     

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

     

       231
       +
       })

     

       232
       +
       

     

       233
       +
       ++ optionals targetPlatform.isCygwin [

     

       234
       +
         (fetchpatch {

     

       235
       +
           name = "cygwin-fix-compilation-with-inhibit_libc.patch";

     

       236
       +
           url = "https://inbox.sourceware.org/gcc-patches/20250926170154.2222977-1-corngood@gmail.com/raw";

     

       237
       +
           hash = "sha256-mgzMRvgPdhj+Q2VRsFhpE2WQzg0CvWsc5/FRAsSU1Es=";

     

       238
       +
         })

     

       239
       +
       ]

pkgs/development/libraries/openssl/default.nix

···

       295
        
                 cat ${conf} > $etc/etc/ssl/openssl.cnf

     

       296
        
               '';

     

       297
        
       

     

       0
        
       
     

       0
        
       
     

       298
        
             postFixup =

     

       299
        
               lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       300
        
                 # Check to make sure the main output and the static runtime dependencies

···

       295
        
                 cat ${conf} > $etc/etc/ssl/openssl.cnf

     

       296
        
               '';

     

       297
        
       

     

       298
       +
             allowedImpureDLLs = [ "CRYPT32.dll" ];

     

       299
       +
       

     

       300
        
             postFixup =

     

       301
        
               lib.optionalString (!stdenv.hostPlatform.isWindows) ''

     

       302
        
                 # Check to make sure the main output and the static runtime dependencies

+25

pkgs/os-specific/cygwin/default.nix

···

       1
       +
       {

     

       2
       +
         makeScopeWithSplicing',

     

       3
       +
         generateSplicesForMkScope,

     

       4
       +
       }:

     

       5
       +
       

     

       6
       +
       let

     

       7
       +
         otherSplices = generateSplicesForMkScope "cygwin";

     

       8
       +
       in

     

       9
       +
       makeScopeWithSplicing' {

     

       10
       +
         inherit otherSplices;

     

       11
       +
         f =

     

       12
       +
           self:

     

       13
       +
           let

     

       14
       +
             callPackage = self.callPackage;

     

       15
       +
           in

     

       16
       +
           {

     

       17
       +
             w32api = callPackage ./w32api { };

     

       18
       +
             w32api-headers = callPackage ./w32api { headersOnly = true; };

     

       19
       +
       

     

       20
       +
             newlib-cygwin = callPackage ./newlib-cygwin { };

     

       21
       +
             # this is here to avoid symlinks being made to cygwin1.dll in /nix/store

     

       22
       +
             newlib-cygwin-nobin = callPackage ./newlib-cygwin/nobin.nix { };

     

       23
       +
             newlib-cygwin-headers = callPackage ./newlib-cygwin { headersOnly = true; };

     

       24
       +
           };

     

       25
       +
       }

+168

pkgs/os-specific/cygwin/newlib-cygwin/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenv,

     

       4
       +
         stdenvNoCC,

     

       5
       +
         stdenvNoLibc,

     

       6
       +
         autoreconfHook,

     

       7
       +
         bison,

     

       8
       +
         buildPackages,

     

       9
       +
         cocom-tool-set,

     

       10
       +
         flex,

     

       11
       +
         perl,

     

       12
       +
         w32api,

     

       13
       +
         w32api-headers,

     

       14
       +
       

     

       15
       +
         headersOnly ? false,

     

       16
       +
       }:

     

       17
       +
       

     

       18
       +
       (if headersOnly then stdenvNoCC else stdenvNoLibc).mkDerivation (

     

       19
       +
         finalAttrs:

     

       20
       +
         {

     

       21
       +
           pname = "newlib-cygwin${lib.optionalString headersOnly "-headers"}";

     

       22
       +
           version = "3.6.4";

     

       23
       +
       

     

       24
       +
           src = buildPackages.fetchgit {

     

       25
       +
             url = "https://cygwin.com/git/newlib-cygwin.git";

     

       26
       +
             rev = "cygwin-${finalAttrs.version}";

     

       27
       +
             hash = "sha256-+WYKwqcDAc7286GzbgKKAxNJCOf3AeNnF8XEVPoor+g=";

     

       28
       +
           };

     

       29
       +
       

     

       30
       +
           outputs = [

     

       31
       +
             "out"

     

       32
       +
           ]

     

       33
       +
           ++ lib.optionals (!headersOnly) [

     

       34
       +
             "bin"

     

       35
       +
             "dev"

     

       36
       +
             "man"

     

       37
       +
           ];

     

       38
       +
       

     

       39
       +
           patches = [

     

       40
       +
             # Newer versions of gcc don't like struct winsize being used before being

     

       41
       +
             # declared. Backport of https://cygwin.com/cgit/newlib-cygwin/commit/?id=73600d68227e125af24b7de7c3fccbd4eb66ee03

     

       42
       +
             ./fix-winsize.patch

     

       43
       +
           ]

     

       44
       +
           ++ lib.optional (!headersOnly) [

     

       45
       +
             # https://cygwin.com/pipermail/cygwin-developers/2020-September/011970.html

     

       46
       +
             # This is required for boost coroutines to work. After we get to the point

     

       47
       +
             # where nix runs on cygwin, we can attempt to upstream this again.

     

       48
       +
             ./store-tls-pointer-in-win32-tls.patch

     

       49
       +
           ]

     

       50
       +
           # After cygwin hosted builds are working, we should upstream this

     

       51
       +
           ++ lib.optional (

     

       52
       +
             !headersOnly && stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform

     

       53
       +
           ) ./fix-cross.patch;

     

       54
       +
       

     

       55
       +
           passthru.w32api = if headersOnly then w32api-headers else w32api;

     

       56
       +
       

     

       57
       +
           meta = {

     

       58
       +
             homepage = "https://cygwin.com/";

     

       59
       +
             description = "A DLL which provides substantial POSIX API functionality on Windows.";

     

       60
       +
             license = with lib.licenses; [

     

       61
       +
               # newlib

     

       62
       +
               gpl2

     

       63
       +
               # winsup

     

       64
       +
               gpl3

     

       65
       +
             ];

     

       66
       +
             platforms = lib.platforms.cygwin;

     

       67
       +
             maintainers = [ lib.maintainers.corngood ];

     

       68
       +
           };

     

       69
       +
         }

     

       70
       +
         // (

     

       71
       +
           if headersOnly then

     

       72
       +
             {

     

       73
       +
               dontConfigure = true;

     

       74
       +
               dontBuild = true;

     

       75
       +
       

     

       76
       +
               installPhase = ''

     

       77
       +
                 mkdir -p $out/include/

     

       78
       +
                 cp -r newlib/libc/include/* $out/include/

     

       79
       +
                 cp -r winsup/cygwin/include/* $out/include/

     

       80
       +
               '';

     

       81
       +
             }

     

       82
       +
           else

     

       83
       +
             {

     

       84
       +
               postPatch = ''

     

       85
       +
                 patchShebangs --build winsup/cygwin/scripts

     

       86
       +
               '';

     

       87
       +
       

     

       88
       +
               autoreconfFlags = [

     

       89
       +
                 "winsup"

     

       90
       +
               ]

     

       91
       +
               # Only reconfigure root when fix-cross.patch is applied. Otherwise the

     

       92
       +
               # autoconf version check will fail.

     

       93
       +
               ++ lib.optional (stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform) ".";

     

       94
       +
       

     

       95
       +
               env =

     

       96
       +
                 let

     

       97
       +
                   libflag = "-Wl,-L${lib.getLib w32api}${w32api.libdir or "/lib/w32api"}";

     

       98
       +
                 in

     

       99
       +
                 {

     

       100
       +
                   CFLAGS_FOR_TARGET = toString [

     

       101
       +
                     libflag

     

       102
       +
                   ];

     

       103
       +
       

     

       104
       +
                   CXXFLAGS_FOR_TARGET = toString [

     

       105
       +
                     "-Wno-error=register"

     

       106
       +
                     libflag

     

       107
       +
                   ];

     

       108
       +
                 };

     

       109
       +
       

     

       110
       +
               strictDeps = true;

     

       111
       +
       

     

       112
       +
               depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       113
       +
       

     

       114
       +
               nativeBuildInputs = [

     

       115
       +
                 autoreconfHook

     

       116
       +
                 bison

     

       117
       +
                 cocom-tool-set

     

       118
       +
                 flex

     

       119
       +
                 perl

     

       120
       +
               ];

     

       121
       +
       

     

       122
       +
               buildInputs = [ w32api ];

     

       123
       +
       

     

       124
       +
               makeFlags = [

     

       125
       +
                 "tooldir=${placeholder "out"}"

     

       126
       +
               ];

     

       127
       +
       

     

       128
       +
               enableParallelBuilding = true;

     

       129
       +
       

     

       130
       +
               # this is explicitly -j1 in cygwin.cygport

     

       131
       +
               # without it the install order is non-deterministic

     

       132
       +
               enableParallelInstalling = false;

     

       133
       +
       

     

       134
       +
               hardeningDisable = [

     

       135
       +
                 # conflicts with internal definition of 'bzero'

     

       136
       +
                 "fortify"

     

       137
       +
                 "stackprotector"

     

       138
       +
               ];

     

       139
       +
       

     

       140
       +
               configurePlatforms = [

     

       141
       +
                 "build"

     

       142
       +
                 "target"

     

       143
       +
               ];

     

       144
       +
       

     

       145
       +
               configureFlags = [

     

       146
       +
                 "--disable-shared"

     

       147
       +
                 "--disable-doc"

     

       148
       +
                 "--enable-static"

     

       149
       +
                 "--disable-dumper"

     

       150
       +
                 "--with-cross-bootstrap"

     

       151
       +
               ]

     

       152
       +
               ++ lib.optional (stdenvNoLibc.hostPlatform != stdenvNoLibc.buildPlatform) [

     

       153
       +
                 "ac_cv_prog_CC=gcc"

     

       154
       +
               ];

     

       155
       +
       

     

       156
       +
               allowedImpureDLLs = [

     

       157
       +
                 "ADVAPI32.dll"

     

       158
       +
                 "PSAPI.DLL"

     

       159
       +
                 "NETAPI32.dll"

     

       160
       +
                 "SHELL32.dll"

     

       161
       +
                 "USER32.dll"

     

       162
       +
                 "USERENV.dll"

     

       163
       +
                 "dbghelp.dll"

     

       164
       +
                 "ntdll.dll"

     

       165
       +
               ];

     

       166
       +
             }

     

       167
       +
         )

     

       168
       +
       )

+55

pkgs/os-specific/cygwin/newlib-cygwin/fix-cross.patch

···

       1
       +
       Disable strict autoconf version check so we can autoreconf in nixpkgs.

     

       2
       +
       

     

       3
       +
       diff --git a/config/override.m4 b/config/override.m4

     

       4
       +
       index 8b954d3cb..60c4cfd12 100644

     

       5
       +
       --- a/config/override.m4

     

       6
       +
       +++ b/config/override.m4

     

       7
       +
       @@ -44,7 +44,6 @@ AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],

     

       8
       +
          [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])

     

       9
       +
        ])

     

       10
       +
        m4_define([AC_INIT], m4_defn([AC_INIT])[

     

       11
       +
       -_GCC_AUTOCONF_VERSION_CHECK

     

       12
       +
        ])

     

       13
       +
        

     

       14
       +
        

     

       15
       +
       

     

       16
       +
       This is needed for target linking to find e.g. crt0.o.

     

       17
       +
       diff --git a/configure.ac b/configure.ac

     

       18
       +
       index 05ddf6987..f5bbd5c72 100644

     

       19
       +
       --- a/configure.ac

     

       20
       +
       +++ b/configure.ac

     

       21
       +
       @@ -3166,7 +3166,7 @@ case " $target_configdirs " in

     

       22
       +
          *" --with-newlib "*)

     

       23
       +
           case "$target" in

     

       24
       +
            *-cygwin*)

     

       25
       +
       -      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'

     

       26
       +
       +      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'

     

       27
       +
              ;;

     

       28
       +
           esac

     

       29
       +
        

     

       30
       +
       

     

       31
       +
       Autoconf clears EXEEXT= in cross, which breaks installation of utils/cygserver.

     

       32
       +
       

     

       33
       +
       AC_CHECK_LIB is disabled in cross after AC_NO_EXECUTABLES.

     

       34
       +
       diff --git a/winsup/configure.ac b/winsup/configure.ac

     

       35
       +
       index e7ac814b1..14b56e130 100644

     

       36
       +
       --- a/winsup/configure.ac

     

       37
       +
       +++ b/winsup/configure.ac

     

       38
       +
       @@ -40,6 +40,8 @@ AM_PROG_AS

     

       39
       +
        AC_LANG(C)

     

       40
       +
        AC_LANG(C++)

     

       41
       +
        

     

       42
       +
       +EXEEXT=.exe

     

       43
       +
       +

     

       44
       +
        AC_ARG_WITH([cross-bootstrap],[AS_HELP_STRING([--with-cross-bootstrap],[do not build programs using the MinGW toolchain or check for MinGW libraries (useful for bootstrapping a cross-compiler)])],[],[with_cross_bootstrap=no])

     

       45
       +
        

     

       46
       +
        AC_CYGWIN_INCLUDES

     

       47
       +
       @@ -135,8 +137,6 @@ AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"])

     

       48
       +
        # libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies

     

       49
       +
        # are, based on what's present in the build environment

     

       50
       +
        BFD_LIBS="-lintl -liconv -liberty -lz"

     

       51
       +
       -AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS="${BFD_LIBS} -lsframe"])

     

       52
       +
       -AC_CHECK_LIB([zstd], [ZSTD_isError], [BFD_LIBS="${BFD_LIBS} -lzstd"])

     

       53
       +
        AC_SUBST([BFD_LIBS])

     

       54
       +
        

     

       55
       +
        AC_CONFIG_FILES([

+31

pkgs/os-specific/cygwin/newlib-cygwin/fix-winsize.patch

···

       1
       +
       diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h

     

       2
       +
       index d1b4a0af5..75e0c5348 100644

     

       3
       +
       --- a/winsup/cygwin/include/sys/termios.h

     

       4
       +
       +++ b/winsup/cygwin/include/sys/termios.h

     

       5
       +
       @@ -282,6 +282,12 @@ struct termios

     

       6
       +
          speed_t	c_ospeed;

     

       7
       +
        };

     

       8
       +
        

     

       9
       +
       +struct winsize

     

       10
       +
       +{

     

       11
       +
       +  unsigned short ws_row, ws_col;

     

       12
       +
       +  unsigned short ws_xpixel, ws_ypixel;

     

       13
       +
       +};

     

       14
       +
       +

     

       15
       +
        #define termio termios

     

       16
       +
        

     

       17
       +
        #ifdef __cplusplus

     

       18
       +
       @@ -313,13 +319,6 @@ int tcsetwinsize(int fd, const struct winsize *winsz);

     

       19
       +
        #define cfgetospeed(tp)		((tp)->c_ospeed)

     

       20
       +
        #endif

     

       21
       +
        

     

       22
       +
       -/* Extra stuff to make porting stuff easier.  */

     

       23
       +
       -struct winsize

     

       24
       +
       -{

     

       25
       +
       -  unsigned short ws_row, ws_col;

     

       26
       +
       -  unsigned short ws_xpixel, ws_ypixel;

     

       27
       +
       -};

     

       28
       +
       -

     

       29
       +
        #define TIOCGWINSZ (('T' << 8) | 1)

     

       30
       +
        #define TIOCSWINSZ (('T' << 8) | 2)

     

       31
       +
        #define TIOCLINUX  (('T' << 8) | 3)

pkgs/os-specific/cygwin/newlib-cygwin/nobin.nix

···

       1
       +
       {

     

       2
       +
         emptyDirectory,

     

       3
       +
         newlib-cygwin,

     

       4
       +
       }:

     

       5
       +
       

     

       6
       +
       newlib-cygwin

     

       7
       +
       // {

     

       8
       +
         bin = emptyDirectory;

     

       9
       +
       }

+88

pkgs/os-specific/cygwin/newlib-cygwin/remove-definitions-that-conflict-with-mingw.patch

···

       1
       +
       From cc95494ed527e64fcd1ade7ed7ae44f9e0a6fa8a Mon Sep 17 00:00:00 2001

     

       2
       +
       From: David McFarland <corngood@gmail.com>

     

       3
       +
       Date: Tue, 9 Sep 2025 15:04:45 -0300

     

       4
       +
       Subject: [PATCH] remove definitions that conflict with mingw

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        winsup/cygwin/fhandler/socket_inet.cc  |  2 ++

     

       8
       +
        winsup/cygwin/fhandler/socket_local.cc |  2 ++

     

       9
       +
        winsup/cygwin/local_includes/ntdll.h   | 20 --------------------

     

       10
       +
        winsup/cygwin/net.cc                   |  2 ++

     

       11
       +
        4 files changed, 6 insertions(+), 20 deletions(-)

     

       12
       +
       

     

       13
       +
       diff --git a/winsup/cygwin/fhandler/socket_inet.cc b/winsup/cygwin/fhandler/socket_inet.cc

     

       14
       +
       index 63cc498f1..03681c07b 100644

     

       15
       +
       --- a/winsup/cygwin/fhandler/socket_inet.cc

     

       16
       +
       +++ b/winsup/cygwin/fhandler/socket_inet.cc

     

       17
       +
       @@ -20,7 +20,9 @@

     

       18
       +
        #undef u_long

     

       19
       +
        #define u_long __ms_u_long

     

       20
       +
        #include <w32api/ws2tcpip.h>

     

       21
       +
       +#define cmsghdr __ms_cmsghdr

     

       22
       +
        #include <w32api/mswsock.h>

     

       23
       +
       +#undef cmsghdr

     

       24
       +
        #include <w32api/mstcpip.h>

     

       25
       +
        #include <netinet/tcp.h>

     

       26
       +
        #include <netinet/udp.h>

     

       27
       +
       diff --git a/winsup/cygwin/fhandler/socket_local.cc b/winsup/cygwin/fhandler/socket_local.cc

     

       28
       +
       index e4a88169b..b832d8a84 100644

     

       29
       +
       --- a/winsup/cygwin/fhandler/socket_local.cc

     

       30
       +
       +++ b/winsup/cygwin/fhandler/socket_local.cc

     

       31
       +
       @@ -21,7 +21,9 @@

     

       32
       +
        #define u_long __ms_u_long

     

       33
       +
        #include "ntsecapi.h"

     

       34
       +
        #include <w32api/ws2tcpip.h>

     

       35
       +
       +#define cmsghdr __ms_cmsghdr

     

       36
       +
        #include <w32api/mswsock.h>

     

       37
       +
       +#undef cmsghdr

     

       38
       +
        #include <unistd.h>

     

       39
       +
        #include <asm/byteorder.h>

     

       40
       +
        #include <sys/socket.h>

     

       41
       +
       diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h

     

       42
       +
       index 4497fe53f..bf86a8293 100644

     

       43
       +
       --- a/winsup/cygwin/local_includes/ntdll.h

     

       44
       +
       +++ b/winsup/cygwin/local_includes/ntdll.h

     

       45
       +
       @@ -489,26 +489,6 @@ typedef struct _FILE_DISPOSITION_INFORMATION_EX	// 64

     

       46
       +
          ULONG Flags;

     

       47
       +
        } FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX;

     

       48
       +
        

     

       49
       +
       -typedef struct _FILE_STAT_INFORMATION		// 68

     

       50
       +
       -{

     

       51
       +
       -  LARGE_INTEGER FileId;

     

       52
       +
       -  LARGE_INTEGER CreationTime;

     

       53
       +
       -  LARGE_INTEGER LastAccessTime;

     

       54
       +
       -  LARGE_INTEGER LastWriteTime;

     

       55
       +
       -  LARGE_INTEGER ChangeTime;

     

       56
       +
       -  LARGE_INTEGER AllocationSize;

     

       57
       +
       -  LARGE_INTEGER EndOfFile;

     

       58
       +
       -  ULONG FileAttributes;

     

       59
       +
       -  ULONG ReparseTag;

     

       60
       +
       -  ULONG NumberOfLinks;

     

       61
       +
       -  ACCESS_MASK EffectiveAccess;

     

       62
       +
       -} FILE_STAT_INFORMATION, *PFILE_STAT_INFORMATION;

     

       63
       +
       -

     

       64
       +
       -typedef struct _FILE_CASE_SENSITIVE_INFORMATION	// 71

     

       65
       +
       -{

     

       66
       +
       -  ULONG Flags;

     

       67
       +
       -} FILE_CASE_SENSITIVE_INFORMATION, *PFILE_CASE_SENSITIVE_INFORMATION;

     

       68
       +
       -

     

       69
       +
        enum {

     

       70
       +
          FILE_LINK_REPLACE_IF_EXISTS				= 0x01,

     

       71
       +
          FILE_LINK_POSIX_SEMANTICS				= 0x02,

     

       72
       +
       diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc

     

       73
       +
       index 737e494f8..6a1a0d079 100644

     

       74
       +
       --- a/winsup/cygwin/net.cc

     

       75
       +
       +++ b/winsup/cygwin/net.cc

     

       76
       +
       @@ -18,7 +18,9 @@ details. */

     

       77
       +
        #undef u_long

     

       78
       +
        #define u_long __ms_u_long

     

       79
       +
        #include <w32api/ws2tcpip.h>

     

       80
       +
       +#define cmsghdr __ms_cmsghdr

     

       81
       +
        #include <w32api/mswsock.h>

     

       82
       +
       +#undef cmsghdr

     

       83
       +
        #include <w32api/iphlpapi.h>

     

       84
       +
        #define gethostname cygwin_gethostname

     

       85
       +
        #include <unistd.h>

     

       86
       +
       -- 

     

       87
       +
       2.50.1

     

       88
       +

+246

pkgs/os-specific/cygwin/newlib-cygwin/store-tls-pointer-in-win32-tls.patch

···

       1
       +
       From f74059ffbcf53d8ff4db59ca9e7b07d58bd3e3c6 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: David McFarland <corngood@gmail.com>

     

       3
       +
       Date: Fri, 4 Sep 2020 10:15:57 -0300

     

       4
       +
       Subject: [PATCH] Cygwin: store tls pointer in win32 tls

     

       5
       +
       

     

       6
       +
       Use WIN32 TLS instead of stack-relative pointers for TLS. This allows windows

     

       7
       +
       fibers and boost coroutines to be used without crashing whenever a syscall is

     

       8
       +
       made from a fiber.

     

       9
       +
       

     

       10
       +
       NOTE: This should be submitted upstream, but there is a blocker first. In the

     

       11
       +
       main branch there are conflicts with new ARM64 support. In addition to fixing

     

       12
       +
       the conflicts, we should actually test whether ARM64 builds work too, first.

     

       13
       +
       ---

     

       14
       +
        winsup/cygwin/create_posix_thread.cc  |  2 ++

     

       15
       +
        winsup/cygwin/cygtls.cc               | 15 +++++++++++++++

     

       16
       +
        winsup/cygwin/dcrt0.cc                |  1 +

     

       17
       +
        winsup/cygwin/fork.cc                 |  1 +

     

       18
       +
        winsup/cygwin/include/cygwin/config.h |  2 +-

     

       19
       +
        winsup/cygwin/init.cc                 | 12 ++++++++----

     

       20
       +
        winsup/cygwin/local_includes/cygtls.h |  7 +++++--

     

       21
       +
        winsup/cygwin/scripts/gendef          | 15 ++++++++++-----

     

       22
       +
        8 files changed, 43 insertions(+), 12 deletions(-)

     

       23
       +
       

     

       24
       +
       diff --git a/winsup/cygwin/create_posix_thread.cc b/winsup/cygwin/create_posix_thread.cc

     

       25
       +
       index 3fcd61707..85c1a8af3 100644

     

       26
       +
       --- a/winsup/cygwin/create_posix_thread.cc

     

       27
       +
       +++ b/winsup/cygwin/create_posix_thread.cc

     

       28
       +
       @@ -52,6 +52,7 @@ pthread_wrapper (PVOID arg)

     

       29
       +
          /* Set stack values in TEB */

     

       30
       +
          PTEB teb = NtCurrentTeb ();

     

       31
       +
          teb->Tib.StackBase = wrapper_arg.stackbase;

     

       32
       +
       +  _set_tls();

     

       33
       +
          teb->Tib.StackLimit = wrapper_arg.stacklimit ?: wrapper_arg.stackaddr;

     

       34
       +
          /* Set DeallocationStack value.  If we have an application-provided stack,

     

       35
       +
             we set DeallocationStack to NULL, so NtTerminateThread does not deallocate

     

       36
       +
       @@ -250,6 +251,7 @@ create_new_main_thread_stack (PVOID &allocationbase)

     

       37
       +
            return NULL;

     

       38
       +
          NtCurrentTeb()->Tib.StackBase = ((PBYTE) allocationbase + stacksize);

     

       39
       +
          NtCurrentTeb()->Tib.StackLimit = stacklimit;

     

       40
       +
       +  _set_tls();

     

       41
       +
          return ((PBYTE) allocationbase + stacksize - 16);

     

       42
       +
        }

     

       43
       +
        

     

       44
       +
       diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc

     

       45
       +
       index 13d133f47..d23f9b42a 100644

     

       46
       +
       --- a/winsup/cygwin/cygtls.cc

     

       47
       +
       +++ b/winsup/cygwin/cygtls.cc

     

       48
       +
       @@ -17,6 +17,20 @@ details. */

     

       49
       +
        #include "sigproc.h"

     

       50
       +
        #include "exception.h"

     

       51
       +
        

     

       52
       +
       +extern DWORD cygtls_slot;

     

       53
       +
       +

     

       54
       +
       +void _set_tls(TEB *teb)

     

       55
       +
       +{

     

       56
       +
       +  TlsSetValue(cygtls_slot, teb->Tib.StackBase);

     

       57
       +
       +}

     

       58
       +
       +

     

       59
       +
       +_cygtls* _current_tls()

     

       60
       +
       +{

     

       61
       +
       +  register void *ret;

     

       62
       +
       +  __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10");

     

       63
       +
       +  return (_cygtls *) ((PBYTE) ret - __CYGTLS_PADSIZE__);

     

       64
       +
       +}

     

       65
       +
       +

     

       66
       +
        /* Two calls to get the stack right... */

     

       67
       +
        void

     

       68
       +
        _cygtls::call (DWORD (*func) (void *, void *), void *arg)

     

       69
       +
       @@ -25,6 +39,7 @@ _cygtls::call (DWORD (*func) (void *, void *), void *arg)

     

       70
       +
          /* Initialize this thread's ability to respond to things like

     

       71
       +
             SIGSEGV or SIGFPE. */

     

       72
       +
          exception protect;

     

       73
       +
       +  _set_tls();

     

       74
       +
          _my_tls.call2 (func, arg, buf);

     

       75
       +
        }

     

       76
       +
        

     

       77
       +
       diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc

     

       78
       +
       index f4c09befd..e6ba488f2 100644

     

       79
       +
       --- a/winsup/cygwin/dcrt0.cc

     

       80
       +
       +++ b/winsup/cygwin/dcrt0.cc

     

       81
       +
       @@ -462,6 +462,7 @@ child_info_fork::alloc_stack ()

     

       82
       +
        	 StackBase in the child to be the same as in the parent, so that the

     

       83
       +
        	 computation of _my_tls is correct. */

     

       84
       +
              teb->Tib.StackBase = (PVOID) stackbase;

     

       85
       +
       +      _set_tls(teb);

     

       86
       +
            }

     

       87
       +
        }

     

       88
       +
        

     

       89
       +
       diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc

     

       90
       +
       index f88acdbbf..582f1a454 100644

     

       91
       +
       --- a/winsup/cygwin/fork.cc

     

       92
       +
       +++ b/winsup/cygwin/fork.cc

     

       93
       +
       @@ -141,6 +141,7 @@ frok::child (volatile char * volatile here)

     

       94
       +
        		myself->pid, myself->ppid, __builtin_frame_address (0));

     

       95
       +
          sigproc_printf ("hParent %p, load_dlls %d", hParent, load_dlls);

     

       96
       +
        

     

       97
       +
       +  _set_tls();

     

       98
       +
          /* Make sure threadinfo information is properly set up. */

     

       99
       +
          if (&_my_tls != _main_tls)

     

       100
       +
            {

     

       101
       +
       diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h

     

       102
       +
       index 2a7083278..21ce484cf 100644

     

       103
       +
       --- a/winsup/cygwin/include/cygwin/config.h

     

       104
       +
       +++ b/winsup/cygwin/include/cygwin/config.h

     

       105
       +
       @@ -37,7 +37,7 @@ extern inline struct _reent *__getreent (void)

     

       106
       +
        {

     

       107
       +
          register char *ret;

     

       108
       +
        #ifdef __x86_64__

     

       109
       +
       -  __asm __volatile__ ("movq %%gs:8,%0" : "=r" (ret));

     

       110
       +
       +  __asm __volatile__ ("movl cygtls_slot(%%rip),%%r10d\nmovq %%gs:0x1480(,%%r10d,8),%0" : "=r" (ret) : : "r10");

     

       111
       +
        #else

     

       112
       +
        #error unimplemented for this target

     

       113
       +
        #endif

     

       114
       +
       diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc

     

       115
       +
       index ce6484aff..392ac8600 100644

     

       116
       +
       --- a/winsup/cygwin/init.cc

     

       117
       +
       +++ b/winsup/cygwin/init.cc

     

       118
       +
       @@ -11,7 +11,7 @@ details. */

     

       119
       +
        #include "ntdll.h"

     

       120
       +
        #include "shared_info.h"

     

       121
       +
        

     

       122
       +
       -static DWORD _my_oldfunc;

     

       123
       +
       +DWORD NO_COPY cygtls_slot;

     

       124
       +
        

     

       125
       +
        static char *search_for  = (char *) cygthread::stub;

     

       126
       +
        unsigned threadfunc_ix[8];

     

       127
       +
       @@ -22,7 +22,9 @@ static bool dll_finished_loading;

     

       128
       +
        static void

     

       129
       +
        threadfunc_fe (VOID *arg)

     

       130
       +
        {

     

       131
       +
       -  _cygtls::call ((DWORD (*)  (void *, void *)) TlsGetValue (_my_oldfunc), arg);

     

       132
       +
       +  PVOID f = TlsGetValue (cygtls_slot);

     

       133
       +
       +  _set_tls();

     

       134
       +
       +  _cygtls::call ((DWORD (*)  (void *, void *)) f, arg);

     

       135
       +
        }

     

       136
       +
        

     

       137
       +
        /* If possible, redirect the thread entry point to a cygwin routine which

     

       138
       +
       @@ -59,7 +61,7 @@ munge_threadfunc ()

     

       139
       +
        	  for (i = 0; threadfunc_ix[i]; i++)

     

       140
       +
        	    if (!threadfunc || ebp[threadfunc_ix[i]] == threadfunc)

     

       141
       +
        	       ebp[threadfunc_ix[i]] = (char *) threadfunc_fe;

     

       142
       +
       -	  TlsSetValue (_my_oldfunc, threadfunc);

     

       143
       +
       +	  TlsSetValue (cygtls_slot, threadfunc);

     

       144
       +
        	}

     

       145
       +
            }

     

       146
       +
        }

     

       147
       +
       @@ -78,6 +80,8 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       148
       +
          switch (reason)

     

       149
       +
            {

     

       150
       +
            case DLL_PROCESS_ATTACH:

     

       151
       +
       +      cygtls_slot = TlsAlloc ();

     

       152
       +
       +      _set_tls();

     

       153
       +
              init_console_handler (false);

     

       154
       +
        

     

       155
       +
              cygwin_hmodule = (HMODULE) h;

     

       156
       +
       @@ -94,7 +98,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       157
       +
              memcpy (_REENT, _GLOBAL_REENT, sizeof (struct _reent));

     

       158
       +
        

     

       159
       +
              dll_crt0_0 ();

     

       160
       +
       -      _my_oldfunc = TlsAlloc ();

     

       161
       +
              dll_finished_loading = true;

     

       162
       +
              break;

     

       163
       +
            case DLL_PROCESS_DETACH:

     

       164
       +
       @@ -102,6 +105,7 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)

     

       165
       +
        	shared_destroy ();

     

       166
       +
              break;

     

       167
       +
            case DLL_THREAD_ATTACH:

     

       168
       +
       +      _set_tls();

     

       169
       +
              if (dll_finished_loading)

     

       170
       +
        	munge_threadfunc ();

     

       171
       +
              break;

     

       172
       +
       diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h

     

       173
       +
       index 306497a33..e3a216280 100644

     

       174
       +
       --- a/winsup/cygwin/local_includes/cygtls.h

     

       175
       +
       +++ b/winsup/cygwin/local_includes/cygtls.h

     

       176
       +
       @@ -301,8 +301,11 @@ private:

     

       177
       +
        #include "cygerrno.h"

     

       178
       +
        #include "ntdll.h"

     

       179
       +
        

     

       180
       +
       -#define _my_tls (*((_cygtls *) ((PBYTE) NtCurrentTeb()->Tib.StackBase \

     

       181
       +
       -		                - __CYGTLS_PADSIZE__)))

     

       182
       +
       +void _set_tls(TEB*);

     

       183
       +
       +inline void _set_tls() { _set_tls(NtCurrentTeb()); }

     

       184
       +
       +_cygtls* _current_tls();

     

       185
       +
       +

     

       186
       +
       +#define _my_tls (*_current_tls())

     

       187
       +
        extern _cygtls *_main_tls;

     

       188
       +
        extern _cygtls *_sig_tls;

     

       189
       +
        

     

       190
       +
       diff --git a/winsup/cygwin/scripts/gendef b/winsup/cygwin/scripts/gendef

     

       191
       +
       index 861a2405b..9a4479bd8 100755

     

       192
       +
       --- a/winsup/cygwin/scripts/gendef

     

       193
       +
       +++ b/winsup/cygwin/scripts/gendef

     

       194
       +
       @@ -118,7 +118,8 @@ EOF

     

       195
       +
        	.seh_proc _sigfe_maybe

     

       196
       +
        _sigfe_maybe:					# stack is aligned on entry!

     

       197
       +
        	.seh_endprologue

     

       198
       +
       -	movq	%gs:8,%r10			# location of bottom of stack

     

       199
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       200
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# location of bottom of stack

     

       201
       +
        	leaq	_cygtls.initialized(%r10),%r11	# where we will be looking

     

       202
       +
        	cmpq	%r11,%rsp			# stack loc > than tls

     

       203
       +
        	jge	0f				# yep.  we don't have a tls.

     

       204
       +
       @@ -131,7 +132,8 @@ _sigfe_maybe:					# stack is aligned on entry!

     

       205
       +
        	.seh_proc _sigfe

     

       206
       +
        _sigfe:						# stack is aligned on entry!

     

       207
       +
        	.seh_endprologue

     

       208
       +
       -	movq	%gs:8,%r10			# location of bottom of stack

     

       209
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       210
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# location of bottom of stack

     

       211
       +
        1:	movl	\$1,%r11d

     

       212
       +
        	xchgl	%r11d,_cygtls.stacklock(%r10)	# try to acquire lock

     

       213
       +
        	testl	%r11d,%r11d			# it will be zero

     

       214
       +
       @@ -154,7 +156,8 @@ _sigfe:						# stack is aligned on entry!

     

       215
       +
        _sigbe:						# return here after cygwin syscall

     

       216
       +
        						# stack is aligned on entry!

     

       217
       +
        	.seh_endprologue

     

       218
       +
       -	movq	%gs:8,%r10			# address of bottom of tls

     

       219
       +
       +	movl	cygtls_slot(%rip),%r10d

     

       220
       +
       +	movq	%gs:0x1480(,%r10d,8),%r10	# address of bottom of tls

     

       221
       +
        1:	movl	\$1,%r11d

     

       222
       +
        	xchgl	%r11d,_cygtls.stacklock(%r10)	# try to acquire lock

     

       223
       +
        	testl	%r11d,%r11d			# it will be zero

     

       224
       +
       @@ -249,7 +252,8 @@ sigdelayed:

     

       225
       +
        2:

     

       226
       +
        	.seh_endprologue

     

       227
       +
        

     

       228
       +
       -	movq	%gs:8,%r12			# get tls

     

       229
       +
       +	movl	cygtls_slot(%rip),%r12d

     

       230
       +
       +	movq	%gs:0x1480(,%r12d,8),%r12	# get tls

     

       231
       +
        	movl	_cygtls.saved_errno(%r12),%r15d	# temporarily save saved_errno

     

       232
       +
        	movq	\$_cygtls.start_offset,%rcx	# point to beginning of tls block

     

       233
       +
        	addq	%r12,%rcx			#  and store as first arg to method

     

       234
       +
       @@ -316,7 +320,8 @@ stabilize_sig_stack:

     

       235
       +
        	subq	\$0x20,%rsp

     

       236
       +
        	.seh_stackalloc 32

     

       237
       +
        	.seh_endprologue

     

       238
       +
       -	movq	%gs:8,%r12

     

       239
       +
       +	movl	cygtls_slot(%rip),%r12d

     

       240
       +
       +	movq	%gs:0x1480(,%r12d,8),%r12

     

       241
       +
        1:	movl	\$1,%r10d

     

       242
       +
        	xchgl	%r10d,_cygtls.stacklock(%r12)	# try to acquire lock

     

       243
       +
        	testl	%r10d,%r10d

     

       244
       +
       -- 

     

       245
       +
       2.50.1

     

       246
       +

+62

pkgs/os-specific/cygwin/w32api/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         stdenvNoCC,

     

       4
       +
         stdenvNoLibc,

     

       5
       +
         autoreconfHook,

     

       6
       +
         windows,

     

       7
       +
       

     

       8
       +
         headersOnly ? false,

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       (if headersOnly then stdenvNoCC else stdenvNoLibc).mkDerivation (

     

       12
       +
         {

     

       13
       +
           pname = "w32api${lib.optionalString headersOnly "-headers"}";

     

       14
       +
       

     

       15
       +
           inherit (windows.mingw_w64_headers)

     

       16
       +
             version

     

       17
       +
             src

     

       18
       +
             ;

     

       19
       +
       

     

       20
       +
           outputs = [

     

       21
       +
             "out"

     

       22
       +
           ]

     

       23
       +
           ++ lib.optional (!headersOnly) "dev";

     

       24
       +
       

     

       25
       +
           configureFlags = [ (lib.enableFeature true "w32api") ];

     

       26
       +
       

     

       27
       +
           enableParallelBuilding = true;

     

       28
       +
       

     

       29
       +
           passthru = {

     

       30
       +
             incdir = "/include/w32api/";

     

       31
       +
             libdir = "/lib/w32api/";

     

       32
       +
           };

     

       33
       +
       

     

       34
       +
           meta = {

     

       35
       +
             description = "MinGW w32api package for Cygwin";

     

       36
       +
             inherit (windows.mingw_w64_headers.meta)

     

       37
       +
               homepage

     

       38
       +
               downloadPage

     

       39
       +
               license

     

       40
       +
               ;

     

       41
       +
             platforms = lib.platforms.unix ++ lib.platforms.windows;

     

       42
       +
             teams = [ lib.maintainers.corngood ];

     

       43
       +
           };

     

       44
       +
         }

     

       45
       +
         // (

     

       46
       +
           if headersOnly then

     

       47
       +
             {

     

       48
       +
               preConfigure = ''

     

       49
       +
                 cd mingw-w64-headers

     

       50
       +
               '';

     

       51
       +
             }

     

       52
       +
           else

     

       53
       +
             {

     

       54
       +
               nativeBuildInputs = [ autoreconfHook ];

     

       55
       +
       

     

       56
       +
               hardeningDisable = [

     

       57
       +
                 "stackprotector"

     

       58
       +
                 "fortify"

     

       59
       +
               ];

     

       60
       +
             }

     

       61
       +
         )

     

       62
       +
       )

pkgs/os-specific/windows/default.nix

···

       7
        
         newScope,

     

       8
        
         overrideCC,

     

       9
        
         stdenvNoLibc,

     

       0
        
       
     

       10
        
       }:

     

       11
        
       

     

       12
        
       lib.makeScope newScope (

···

       7
        
         newScope,

     

       8
        
         overrideCC,

     

       9
        
         stdenvNoLibc,

     

       10
       +
         emptyDirectory,

     

       11
        
       }:

     

       12
        
       

     

       13
        
       lib.makeScope newScope (

+18

pkgs/stdenv/generic/make-derivation.nix

···

       176
        
           "disallowedRequisites"

     

       177
        
           "allowedReferences"

     

       178
        
           "allowedRequisites"

     

       0
        
       
     

       179
        
         ];

     

       180
        
       

     

       181
        
         inherit (stdenv)

     
···

       198
        
           isLinux

     

       199
        
           isDarwin

     

       200
        
           isWindows

     

       0
        
       
     

       201
        
           isOpenBSD

     

       202
        
           isStatic

     

       203
        
           isMusl

     
···

       358
        
             sandboxProfile ? "",

     

       359
        
             propagatedSandboxProfile ? "",

     

       360
        
       

     

       0
        
       
     

       0
        
       
     

       361
        
             hardeningEnable ? [ ],

     

       362
        
             hardeningDisable ? [ ],

     

       363
        
       

     
···

       479
        
                 nativeBuildInputs

     

       480
        
                 ++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh

     

       481
        
                 ++ optional isWindows ../../build-support/setup-hooks/win-dll-link.sh

     

       0
        
       
     

       482
        
                 ++ optionals doCheck nativeCheckInputs

     

       483
        
                 ++ optionals doInstallCheck nativeInstallCheckInputs;

     

       484
        
       

     
···

       699
        
                         "/bin/sh"

     

       700
        
                       ];

     

       701
        
                     __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       702
        
                   }

     

       703
        
                 )

     

       704
        
                 // (

···

       176
        
           "disallowedRequisites"

     

       177
        
           "allowedReferences"

     

       178
        
           "allowedRequisites"

     

       179
       +
           "allowedImpureDLLs"

     

       180
        
         ];

     

       181
        
       

     

       182
        
         inherit (stdenv)

     
···

       199
        
           isLinux

     

       200
        
           isDarwin

     

       201
        
           isWindows

     

       202
       +
           isCygwin

     

       203
        
           isOpenBSD

     

       204
        
           isStatic

     

       205
        
           isMusl

     
···

       360
        
             sandboxProfile ? "",

     

       361
        
             propagatedSandboxProfile ? "",

     

       362
        
       

     

       363
       +
             allowedImpureDLLs ? [ ],

     

       364
       +
       

     

       365
        
             hardeningEnable ? [ ],

     

       366
        
             hardeningDisable ? [ ],

     

       367
        
       

     
···

       483
        
                 nativeBuildInputs

     

       484
        
                 ++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh

     

       485
        
                 ++ optional isWindows ../../build-support/setup-hooks/win-dll-link.sh

     

       486
       +
                 ++ optional isCygwin ../../build-support/setup-hooks/cygwin-dll-link.sh

     

       487
        
                 ++ optionals doCheck nativeCheckInputs

     

       488
        
                 ++ optionals doInstallCheck nativeInstallCheckInputs;

     

       489
        
       

     
···

       704
        
                         "/bin/sh"

     

       705
        
                       ];

     

       706
        
                     __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;

     

       707
       +
                   }

     

       708
       +
                 )

     

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

     

       710
       +
                   let

     

       711
       +
                     dlls =

     

       712
       +
                       allowedImpureDLLs

     

       713
       +
                       ++ lib.optionals isCygwin [

     

       714
       +
                         "KERNEL32.dll"

     

       715
       +
                         "cygwin1.dll"

     

       716
       +
                       ];

     

       717
       +
                   in

     

       718
       +
                   {

     

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

     

       720
        
                   }

     

       721
        
                 )

     

       722
        
                 // (

+8 -1

pkgs/top-level/all-packages.nix

···

       4805
        
               isl = if !stdenv.hostPlatform.isDarwin then isl_0_20 else null;

     

       4806
        
       

     

       4807
        
               withoutTargetLibc = true;

     

       4808
       -
               langCC = false;

     

       4809
        
               libcCross = libc1;

     

       4810
        
               targetPackages.stdenv.cc.bintools = binutilsNoLibc;

     

       4811
        
               enableShared =

     
···

       4814
        
                 # temporarily disabled due to breakage;

     

       4815
        
                 # see https://github.com/NixOS/nixpkgs/pull/243249

     

       4816
        
                 && !stdenv.targetPlatform.isWindows

     

       0
        
       
     

       4817
        
                 && !(stdenv.targetPlatform.useLLVM or false);

     

       4818
        
             };

     

       4819
        
             bintools = binutilsNoLibc;

     
···

       7516
        
             windows.mingw_w64_headers or fallback

     

       7517
        
           else if libc == "nblibc" then

     

       7518
        
             netbsd.headers

     

       0
        
       
     

       0
        
       
     

       7519
        
           else

     

       7520
        
             null;

     

       7521
        
       

     
···

       7552
        
             if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk

     

       7553
        
           else if libc == "ucrt" then

     

       7554
        
             if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk

     

       0
        
       
     

       0
        
       
     

       7555
        
           else if libc == "libSystem" then

     

       7556
        
             if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem

     

       7557
        
           else if libc == "fblibc" then

     
···

       10650
        
         v4l-utils = callPackage ../os-specific/linux/v4l-utils { };

     

       10651
        
       

     

       10652
        
         windows = recurseIntoAttrs (callPackages ../os-specific/windows { });

     

       0
        
       
     

       0
        
       
     

       10653
        
       

     

       10654
        
         wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };

     

       10655

···

       4805
        
               isl = if !stdenv.hostPlatform.isDarwin then isl_0_20 else null;

     

       4806
        
       

     

       4807
        
               withoutTargetLibc = true;

     

       4808
       +
               langCC = stdenv.targetPlatform.isCygwin; # can't compile libcygwin1.a without C++

     

       4809
        
               libcCross = libc1;

     

       4810
        
               targetPackages.stdenv.cc.bintools = binutilsNoLibc;

     

       4811
        
               enableShared =

     
···

       4814
        
                 # temporarily disabled due to breakage;

     

       4815
        
                 # see https://github.com/NixOS/nixpkgs/pull/243249

     

       4816
        
                 && !stdenv.targetPlatform.isWindows

     

       4817
       +
                 && !stdenv.targetPlatform.isCygwin

     

       4818
        
                 && !(stdenv.targetPlatform.useLLVM or false);

     

       4819
        
             };

     

       4820
        
             bintools = binutilsNoLibc;

     
···

       7517
        
             windows.mingw_w64_headers or fallback

     

       7518
        
           else if libc == "nblibc" then

     

       7519
        
             netbsd.headers

     

       7520
       +
           else if libc == "cygwin" then

     

       7521
       +
             cygwin.newlib-cygwin-headers

     

       7522
        
           else

     

       7523
        
             null;

     

       7524
        
       

     
···

       7555
        
             if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk

     

       7556
        
           else if libc == "ucrt" then

     

       7557
        
             if stdenv.hostPlatform.isMinGW then windows.mingw_w64 else windows.sdk

     

       7558
       +
           else if libc == "cygwin" then

     

       7559
       +
             cygwin.newlib-cygwin-nobin

     

       7560
        
           else if libc == "libSystem" then

     

       7561
        
             if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem

     

       7562
        
           else if libc == "fblibc" then

     
···

       10655
        
         v4l-utils = callPackage ../os-specific/linux/v4l-utils { };

     

       10656
        
       

     

       10657
        
         windows = recurseIntoAttrs (callPackages ../os-specific/windows { });

     

       10658
       +
       

     

       10659
       +
         cygwin = recurseIntoAttrs (callPackages ../os-specific/cygwin { });

     

       10660
        
       

     

       10661
        
         wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };

     

       10662

pkgs/top-level/release-cross.nix

···

       112
        
           windows.pthreads = nativePlatforms;

     

       113
        
         };

     

       114
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       115
        
         wasiCommon = {

     

       116
        
           gmp = nativePlatforms;

     

       117
        
           boehmgc = nativePlatforms;

     
···

       205
        
       

     

       206
        
         # Test some cross builds on 64 bit mingw-w64

     

       207
        
         crossMingwW64 = mapTestOnCross systems.examples.mingwW64 windowsCommon;

     

       0
        
       
     

       0
        
       
     

       208
        
       

     

       209
        
         # Linux on mipsel

     

       210
        
         fuloongminipc = mapTestOnCross systems.examples.fuloongminipc linuxCommon;

···

       112
        
           windows.pthreads = nativePlatforms;

     

       113
        
         };

     

       114
        
       

     

       115
       +
         cygwinCommon = {

     

       116
       +
           hello = nativePlatforms;

     

       117
       +
         };

     

       118
       +
       

     

       119
        
         wasiCommon = {

     

       120
        
           gmp = nativePlatforms;

     

       121
        
           boehmgc = nativePlatforms;

     
···

       209
        
       

     

       210
        
         # Test some cross builds on 64 bit mingw-w64

     

       211
        
         crossMingwW64 = mapTestOnCross systems.examples.mingwW64 windowsCommon;

     

       212
       +
       

     

       213
       +
         x86_64-cygwin = mapTestOnCross systems.examples.x86_64-cygwin cygwinCommon;

     

       214
        
       

     

       215
        
         # Linux on mipsel

     

       216
        
         fuloongminipc = mapTestOnCross systems.examples.fuloongminipc linuxCommon;