commit bfc3acf8f3b788f4a38d29b3fea595f43ded0626 · pyrox.dev/nixpkgs

+1 -1

pkgs/by-name/qm/qmk/package.nix

···

       53
       53
        
             pkgsCross.avr.buildPackages.binutils

     

       54
       54
        
             pkgsCross.avr.buildPackages.binutils.bintools

     

       55
       55
        
             pkgsCross.avr.buildPackages.gcc

     

       56
       56
       -
             pkgsCross.avr.libcCross

     

       56
       56
       +
             pkgsCross.avr.libc

     

       57
       57
        
           ];

     

       58
       58
        
       

     

       59
       59
        
         # no tests implemented

+2 -2

pkgs/by-name/sh/shadow/package.nix

···

       14
       14
        
         libxslt,

     

       15
       15
        
         libxcrypt,

     

       16
       16
        
         pkg-config,

     

       17
       17
       -
         glibcCross ? null,

     

       17
       17
       +
         glibc ? null,

     

       18
       18
        
         pam ? null,

     

       19
       19
        
         withLibbsd ? lib.meta.availableOn stdenv.hostPlatform libbsd,

     

       20
       20
        
         libbsd,

     
···

       24
       24
        
       let

     

       25
       25
        
         glibc =

     

       26
       26
        
           if stdenv.hostPlatform != stdenv.buildPlatform then

     

       27
       27
       -
             glibcCross

     

       27
       27
       +
             glibc

     

       28
       28
        
           else

     

       29
       29
        
             assert stdenv.hostPlatform.libc == "glibc";

     

       30
       30
        
             stdenv.cc.libc;

+9 -4

pkgs/development/compilers/gcc/all.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         pkgs,

     

       5
       5
       +
         targetPackages,

     

       5
       6
        
         callPackage,

     

       6
       7
        
         isl_0_20,

     

       7
       7
       -
         libcCross,

     

       8
       8
       -
         threadsCross,

     

       9
       8
        
         noSysDirs,

     

       10
       9
        
         lowPrio,

     

       11
       10
        
         wrapCC,

     
···

       27
       26
        
                   reproducibleBuild = true;

     

       28
       27
        
                   profiledCompiler = false;

     

       29
       28
        
                   libcCross =

     

       30
       30
       -
                     if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then args.libcCross else null;

     

       29
       29
       +
                     if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then

     

       30
       30
       +
                       targetPackages.libc or pkgs.libc

     

       31
       31
       +
                     else

     

       32
       32
       +
                       null;

     

       31
       33
        
                   threadsCross =

     

       32
       32
       -
                     if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then threadsCross else { };

     

       34
       34
       +
                     if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then

     

       35
       35
       +
                       targetPackages.threads or pkgs.threads

     

       36
       36
       +
                     else

     

       37
       37
       +
                       { };

     

       33
       38
        
                   isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20;

     

       34
       39
        
                   # do not allow version skew when cross-building gcc

     

       35
       40
        
                   #

+1 -1

pkgs/development/compilers/gcc/default.nix

···

       38
       38
        
         enablePlugin ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), # Whether to support user-supplied plug-ins

     

       39
       39
        
         name ? "gcc",

     

       40
       40
        
         libcCross ? null,

     

       41
       41
       -
         threadsCross ? null, # for MinGW

     

       41
       41
       +
         threadsCross ? { }, # for MinGW

     

       42
       42
        
         withoutTargetLibc ? false,

     

       43
       43
        
         flex,

     

       44
       44
        
         gnused ? null,

+2 -2

pkgs/development/compilers/go/1.23.nix

···

       8
       8
        
         mailcap,

     

       9
       9
        
         buildPackages,

     

       10
       10
        
         pkgsBuildTarget,

     

       11
       11
       -
         threadsCross,

     

       11
       11
       +
         targetPackages,

     

       12
       12
        
         testers,

     

       13
       13
        
         skopeo,

     

       14
       14
        
         buildGo123Module,

     
···

       42
       42
        
       

     

       43
       43
        
         depsBuildTarget = lib.optional isCross targetCC;

     

       44
       44
        
       

     

       45
       45
       -
         depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;

     

       45
       45
       +
         depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;

     

       46
       46
        
       

     

       47
       47
        
         postPatch = ''

     

       48
       48
        
           patchShebangs .

+2 -2

pkgs/development/compilers/go/1.24.nix

···

       8
       8
        
         mailcap,

     

       9
       9
        
         buildPackages,

     

       10
       10
        
         pkgsBuildTarget,

     

       11
       11
       -
         threadsCross,

     

       11
       11
       +
         targetPackages,

     

       12
       12
        
         testers,

     

       13
       13
        
         skopeo,

     

       14
       14
        
         buildGo124Module,

     
···

       42
       42
        
       

     

       43
       43
        
         depsBuildTarget = lib.optional isCross targetCC;

     

       44
       44
        
       

     

       45
       45
       -
         depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;

     

       45
       45
       +
         depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;

     

       46
       46
        
       

     

       47
       47
        
         postPatch = ''

     

       48
       48
        
           patchShebangs .

+2 -2

pkgs/development/compilers/llvm/common/default.nix

···

       2
       2
        
         lowPrio,

     

       3
       3
        
         newScope,

     

       4
       4
        
         pkgs,

     

       5
       5
       +
         targetPackages,

     

       5
       6
        
         lib,

     

       6
       7
        
         stdenv,

     

       7
       7
       -
         preLibcCrossHeaders,

     

       8
       8
        
         libxcrypt,

     

       9
       9
        
         substitute,

     

       10
       10
        
         replaceVars,

     
···

       255
       255
        
       

     

       256
       256
        
             bintoolsNoLibc = wrapBintoolsWith {

     

       257
       257
        
               bintools = tools.bintools-unwrapped;

     

       258
       258
       -
               libc = preLibcCrossHeaders;

     

       258
       258
       +
               libc = targetPackages.preLibcHeaders;

     

       259
       259
        
             };

     

       260
       260
        
       

     

       261
       261
        
             bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };

+3 -3

pkgs/os-specific/windows/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         buildPackages,

     

       5
       5
       +
         pkgs,

     

       5
       6
        
         newScope,

     

       6
       7
        
         overrideCC,

     

       7
       8
        
         stdenvNoLibc,

     

       8
       8
       -
         libcCross,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       lib.makeScope newScope (

     
···

       31
       31
        
             else

     

       32
       32
        
               buildPackages.gccWithoutTargetLibc.override (old: {

     

       33
       33
        
                 bintools = old.bintools.override {

     

       34
       34
       -
                   libc = libcCross;

     

       34
       34
       +
                   libc = pkgs.libc;

     

       35
       35
        
                 };

     

       36
       36
       -
                 libc = libcCross;

     

       36
       36
       +
                 libc = pkgs.libc;

     

       37
       37
        
               })

     

       38
       38
        
           );

     

       39
       39

-2

pkgs/top-level/aliases.nix

···

       320
       320
        
         autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25

     

       321
       321
        
         avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17

     

       322
       322
        
         avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31

     

       323
       323
       -
         avrlibcCross = avrlibc; # Added 2024-09-06

     

       324
       323
        
         axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17

     

       325
       324
        
         awesome-4-0 = awesome; # Added 2022-05-05

     

       326
       325
        
         aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11

     
···

       1956
       1955
        
         ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17

     

       1957
       1956
        
         ubuntu_font_family = ubuntu-classic; # Added 2024-02-19

     

       1958
       1957
        
         uclibc = uclibc-ng; # Added 2022-06-16

     

       1959
       1959
       -
         uclibcCross = uclibc-ng; # Added 2022-06-16

     

       1960
       1958
        
         unicap = "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17

     

       1961
       1959
        
         unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17

     

       1962
       1960
        
         uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI";

+88 -87

pkgs/top-level/all-packages.nix

···

       5174
       5174
        
         gccWithoutTargetLibc =

     

       5175
       5175
        
           assert stdenv.targetPlatform != stdenv.hostPlatform;

     

       5176
       5176
        
           let

     

       5177
       5177
       -
             libcCross1 = binutilsNoLibc.libc;

     

       5177
       5177
       +
             libc1 = binutilsNoLibc.libc;

     

       5178
       5178
        
           in

     

       5179
       5179
        
           wrapCCWith {

     

       5180
       5180
        
             cc = gccFun {

     
···

       5189
       5189
        
       

     

       5190
       5190
        
               withoutTargetLibc = true;

     

       5191
       5191
        
               langCC = false;

     

       5192
       5192
       -
               libcCross = libcCross1;

     

       5192
       5192
       +
               libcCross = libc1;

     

       5193
       5193
        
               targetPackages.stdenv.cc.bintools = binutilsNoLibc;

     

       5194
       5194
        
               enableShared =

     

       5195
       5195
        
                 stdenv.targetPlatform.hasSharedLibraries

     
···

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

     

       5201
       5201
        
             };

     

       5202
       5202
        
             bintools = binutilsNoLibc;

     

       5203
       5203
       -
             libc = libcCross1;

     

       5203
       5203
       +
             libc = libc1;

     

       5204
       5204
        
             extraPackages = [ ];

     

       5205
       5205
        
           };

     

       5206
       5206
        
       

     
···

       6141
       6141
        
             libcxx ? null,

     

       6142
       6142
        
             extraPackages ? lib.optional (

     

       6143
       6143
        
               cc.isGNU or false && stdenv.targetPlatform.isMinGW

     

       6144
       6144
       -
             ) threadsCross.package,

     

       6144
       6144
       +
             ) targetPackages.threads.package,

     

       6145
       6145
        
             nixSupport ? { },

     

       6146
       6146
        
             ...

     

       6147
       6147
        
           }@extraArgs:

     
···

       6181
       6181
        
         wrapBintoolsWith =

     

       6182
       6182
        
           {

     

       6183
       6183
        
             bintools,

     

       6184
       6184
       -
             libc ? if stdenv.targetPlatform != stdenv.hostPlatform then libcCross else stdenv.cc.libc,

     

       6184
       6184
       +
             libc ? if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else stdenv.cc.libc,

     

       6185
       6185
        
             ...

     

       6186
       6186
        
           }@extraArgs:

     

       6187
       6187
        
           callPackage ../build-support/bintools-wrapper (

     
···

       6999
       6999
        
         });

     

       7000
       7000
        
         binutilsNoLibc = wrapBintoolsWith {

     

       7001
       7001
        
           bintools = binutils-unwrapped;

     

       7002
       7002
       -
           libc = preLibcCrossHeaders;

     

       7002
       7002
       +
           libc = targetPackages.preLibcHeaders;

     

       7003
       7003
        
         };

     

       7004
       7004
        
       

     

       7005
       7005
        
         libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { };

     
···

       7053
       7053
        
             null;

     

       7054
       7054
        
         bintoolsNoLibc = wrapBintoolsWith {

     

       7055
       7055
        
           bintools = bintools-unwrapped;

     

       7056
       7056
       -
           libc = preLibcCrossHeaders;

     

       7056
       7056
       +
           libc = targetPackages.preLibcHeaders;

     

       7057
       7057
        
         };

     

       7058
       7058
        
         bintools = wrapBintoolsWith {

     

       7059
       7059
        
           bintools = bintools-unwrapped;

     
···

       8153
       8153
        
           withMinecraftPatch = true;

     

       8154
       8154
        
         };

     

       8155
       8155
        
       

     

       8156
       8156
       -
         glibc = callPackage ../development/libraries/glibc {

     

       8157
       8157
       -
           stdenv = gccStdenv; # doesn't compile without gcc

     

       8158
       8158
       -
         };

     

       8156
       8156
       +
         glibc = callPackage ../development/libraries/glibc (

     

       8157
       8157
       +
           if stdenv.hostPlatform != stdenv.buildPlatform then

     

       8158
       8158
       +
             {

     

       8159
       8159
       +
               stdenv = gccCrossLibcStdenv; # doesn't compile without gcc

     

       8160
       8160
       +
               libgcc = callPackage ../development/libraries/gcc/libgcc {

     

       8161
       8161
       +
                 gcc = gccCrossLibcStdenv.cc;

     

       8162
       8162
       +
                 glibc = glibc.override { libgcc = null; };

     

       8163
       8163
       +
                 stdenvNoLibs = gccCrossLibcStdenv;

     

       8164
       8164
       +
               };

     

       8165
       8165
       +
             }

     

       8166
       8166
       +
           else

     

       8167
       8167
       +
             {

     

       8168
       8168
       +
               stdenv = gccStdenv; # doesn't compile without gcc

     

       8169
       8169
       +
             }

     

       8170
       8170
       +
         );

     

       8159
       8171
        
       

     

       8160
       8172
        
         mtrace = callPackage ../development/libraries/glibc/mtrace.nix { };

     

       8161
       8173
        
       

     
···

       8166
       8178
        
           withGd = true;

     

       8167
       8179
        
         };

     

       8168
       8180
        
       

     

       8169
       8169
       -
         # Being redundant to avoid cycles on boot. TODO: find a better way

     

       8170
       8170
       -
         glibcCross = callPackage ../development/libraries/glibc {

     

       8171
       8171
       -
           stdenv = gccCrossLibcStdenv; # doesn't compile without gcc

     

       8172
       8172
       -
           libgcc = callPackage ../development/libraries/gcc/libgcc {

     

       8173
       8173
       -
             gcc = gccCrossLibcStdenv.cc;

     

       8174
       8174
       -
             glibc = glibcCross.override { libgcc = null; };

     

       8175
       8175
       -
             stdenvNoLibs = gccCrossLibcStdenv;

     

       8176
       8176
       -
           };

     

       8177
       8177
       -
         };

     

       8178
       8178
       -
       

     

       8179
       8179
       -
         muslCross = musl.override {

     

       8180
       8180
       -
           stdenv = stdenvNoLibc;

     

       8181
       8181
       -
         };

     

       8181
       8181
       +
         musl = callPackage ../by-name/mu/musl/package.nix (

     

       8182
       8182
       +
           lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {

     

       8183
       8183
       +
             stdenv = stdenvNoLibc;

     

       8184
       8184
       +
           }

     

       8185
       8185
       +
         );

     

       8182
       8186
        
       

     

       8183
       8187
        
         # These are used when building compiler-rt / libgcc, prior to building libc.

     

       8184
       8184
       -
         preLibcCrossHeaders =

     

       8188
       8188
       +
         preLibcHeaders =

     

       8185
       8189
        
           let

     

       8186
       8186
       -
             inherit (stdenv.targetPlatform) libc;

     

       8190
       8190
       +
             inherit (stdenv.hostPlatform) libc;

     

       8187
       8191
        
           in

     

       8188
       8188
       -
           if stdenv.targetPlatform.isMinGW then

     

       8189
       8189
       -
             targetPackages.windows.mingw_w64_headers or windows.mingw_w64_headers

     

       8192
       8192
       +
           if stdenv.hostPlatform.isMinGW then

     

       8193
       8193
       +
             windows.mingw_w64_headers or fallback

     

       8190
       8194
        
           else if libc == "nblibc" then

     

       8191
       8191
       -
             targetPackages.netbsd.headers or netbsd.headers

     

       8195
       8195
       +
             netbsd.headers

     

       8192
       8196
        
           else

     

       8193
       8197
        
             null;

     

       8194
       8198
        
       

     

       8195
       8199
        
         # We can choose:

     

       8196
       8196
       -
         libcCrossChooser =

     

       8197
       8197
       -
           name:

     

       8198
       8198
       -
           # libc is hackily often used from the previous stage. This `or`

     

       8199
       8199
       -
           # hack fixes the hack, *sigh*.

     

       8200
       8200
       -
           if name == null then

     

       8201
       8201
       -
             null

     

       8202
       8202
       -
           else if name == "glibc" then

     

       8203
       8203
       -
             targetPackages.glibcCross or glibcCross

     

       8204
       8204
       -
           else if name == "bionic" then

     

       8205
       8205
       -
             targetPackages.bionic or bionic

     

       8206
       8206
       -
           else if name == "uclibc" then

     

       8207
       8207
       -
             targetPackages.uclibc or uclibc

     

       8208
       8208
       -
           else if name == "avrlibc" then

     

       8209
       8209
       -
             targetPackages.avrlibc or avrlibc

     

       8210
       8210
       -
           else if name == "newlib" && stdenv.targetPlatform.isMsp430 then

     

       8211
       8211
       -
             targetPackages.msp430Newlib or msp430Newlib

     

       8212
       8212
       -
           else if name == "newlib" && stdenv.targetPlatform.isVc4 then

     

       8213
       8213
       -
             targetPackages.vc4-newlib or vc4-newlib

     

       8214
       8214
       -
           else if name == "newlib" && stdenv.targetPlatform.isOr1k then

     

       8215
       8215
       -
             targetPackages.or1k-newlib or or1k-newlib

     

       8216
       8216
       -
           else if name == "newlib" then

     

       8217
       8217
       -
             targetPackages.newlib or newlib

     

       8218
       8218
       -
           else if name == "newlib-nano" then

     

       8219
       8219
       -
             targetPackages.newlib-nano or newlib-nano

     

       8220
       8220
       -
           else if name == "musl" then

     

       8221
       8221
       -
             targetPackages.muslCross or muslCross

     

       8222
       8222
       -
           else if name == "msvcrt" then

     

       8223
       8223
       -
             targetPackages.windows.mingw_w64 or windows.mingw_w64

     

       8224
       8224
       -
           else if name == "ucrt" then

     

       8225
       8225
       -
             targetPackages.windows.mingw_w64 or windows.mingw_w64

     

       8226
       8226
       -
           else if name == "libSystem" then

     

       8227
       8227
       -
             if stdenv.targetPlatform.useiOSPrebuilt then

     

       8228
       8228
       -
               targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries

     

       8200
       8200
       +
         libc =

     

       8201
       8201
       +
           if stdenv.hostPlatform == stdenv.buildPlatform then

     

       8202
       8202
       +
             # TODO get rid of this branch after the native boostrap is reworked

     

       8203
       8203
       +
             stdenv.cc.libc

     

       8204
       8204
       +
           else

     

       8205
       8205
       +
             let

     

       8206
       8206
       +
               inherit (stdenv.hostPlatform) libc;

     

       8207
       8207
       +
               # libc is hackily often used from the previous stage. This `or`

     

       8208
       8208
       +
               # hack fixes the hack, *sigh*.

     

       8209
       8209
       +
             in

     

       8210
       8210
       +
             if libc == null then

     

       8211
       8211
       +
               null

     

       8212
       8212
       +
             else if libc == "glibc" then

     

       8213
       8213
       +
               glibc

     

       8214
       8214
       +
             else if libc == "bionic" then

     

       8215
       8215
       +
               bionic

     

       8216
       8216
       +
             else if libc == "uclibc" then

     

       8217
       8217
       +
               uclibc

     

       8218
       8218
       +
             else if libc == "avrlibc" then

     

       8219
       8219
       +
               avrlibc

     

       8220
       8220
       +
             else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then

     

       8221
       8221
       +
               msp430Newlib

     

       8222
       8222
       +
             else if libc == "newlib" && stdenv.hostPlatform.isVc4 then

     

       8223
       8223
       +
               vc4-newlib

     

       8224
       8224
       +
             else if libc == "newlib" && stdenv.hostPlatform.isOr1k then

     

       8225
       8225
       +
               or1k-newlib

     

       8226
       8226
       +
             else if libc == "newlib" then

     

       8227
       8227
       +
               newlib

     

       8228
       8228
       +
             else if libc == "newlib-nano" then

     

       8229
       8229
       +
               newlib-nano

     

       8230
       8230
       +
             else if libc == "musl" then

     

       8231
       8231
       +
               musl

     

       8232
       8232
       +
             else if libc == "msvcrt" then

     

       8233
       8233
       +
               windows.mingw_w64

     

       8234
       8234
       +
             else if libc == "ucrt" then

     

       8235
       8235
       +
               windows.mingw_w64

     

       8236
       8236
       +
             else if libc == "libSystem" then

     

       8237
       8237
       +
               if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem

     

       8238
       8238
       +
             else if libc == "fblibc" then

     

       8239
       8239
       +
               freebsd.libc

     

       8240
       8240
       +
             else if libc == "oblibc" then

     

       8241
       8241
       +
               openbsd.libc

     

       8242
       8242
       +
             else if libc == "nblibc" then

     

       8243
       8243
       +
               netbsd.libc

     

       8244
       8244
       +
             else if libc == "wasilibc" then

     

       8245
       8245
       +
               wasilibc

     

       8246
       8246
       +
             else if libc == "relibc" then

     

       8247
       8247
       +
               relibc

     

       8248
       8248
       +
             else if name == "llvm" then

     

       8249
       8249
       +
               llvmPackages_20.libc

     

       8229
       8250
        
             else

     

       8230
       8230
       -
               targetPackages.darwin.libSystem or darwin.libSystem

     

       8231
       8231
       -
           else if name == "fblibc" then

     

       8232
       8232
       -
             targetPackages.freebsd.libc or freebsd.libc

     

       8233
       8233
       -
           else if name == "oblibc" then

     

       8234
       8234
       -
             targetPackages.openbsd.libc or openbsd.libc

     

       8235
       8235
       -
           else if name == "nblibc" then

     

       8236
       8236
       -
             targetPackages.netbsd.libc or netbsd.libc

     

       8237
       8237
       -
           else if name == "wasilibc" then

     

       8238
       8238
       -
             targetPackages.wasilibc or wasilibc

     

       8239
       8239
       -
           else if name == "relibc" then

     

       8240
       8240
       -
             targetPackages.relibc or relibc

     

       8241
       8241
       -
           else if name == "llvm" then

     

       8242
       8242
       -
             targetPackages.llvmPackages_20.libc or llvmPackages_20.libc

     

       8243
       8243
       -
           else

     

       8244
       8244
       -
             throw "Unknown libc ${name}";

     

       8251
       8251
       +
               throw "Unknown libc ${libc}";

     

       8245
       8252
        
       

     

       8246
       8246
       -
         libcCross =

     

       8247
       8247
       -
           if stdenv.targetPlatform == stdenv.buildPlatform then

     

       8248
       8248
       -
             null

     

       8249
       8249
       -
           else

     

       8250
       8250
       -
             libcCrossChooser stdenv.targetPlatform.libc;

     

       8251
       8251
       -
       

     

       8252
       8252
       -
         threadsCross =

     

       8253
       8253
       -
           lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false))

     

       8253
       8253
       +
         threads =

     

       8254
       8254
       +
           lib.optionalAttrs (stdenv.hostPlatform.isMinGW && !(stdenv.hostPlatform.useLLVM or false))

     

       8254
       8255
        
             {

     

       8255
       8256
        
               # other possible values: win32 or posix

     

       8256
       8257
        
               model = "mcf";

     

       8257
       8258
        
               # For win32 or posix set this to null

     

       8258
       8258
       -
               package = targetPackages.windows.mcfgthreads or windows.mcfgthreads;

     

       8259
       8259
       +
               package = windows.mcfgthreads;

     

       8259
       8260
        
             };

     

       8260
       8261
        
       

     

       8261
       8262
        
         wasilibc = callPackage ../development/libraries/wasilibc {

     
···

       8771
       8772
        
               "fblibc"

     

       8772
       8773
        
             ]

     

       8773
       8774
        
           then

     

       8774
       8774
       -
             libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc)

     

       8775
       8775
       +
             libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libc else stdenv.cc.libc)

     

       8775
       8776
        
           else if stdenv.hostPlatform.isDarwin then

     

       8776
       8777
        
             darwin.libiconv

     

       8777
       8778
        
           else

     
···

       9578
       9579
        
       

     

       9579
       9580
        
         simavr = callPackage ../development/tools/simavr {

     

       9580
       9581
        
           avrgcc = pkgsCross.avr.buildPackages.gcc;

     

       9581
       9581
       -
           avrlibc = pkgsCross.avr.libcCross;

     

       9582
       9582
       +
           avrlibc = pkgsCross.avr.libc;

     

       9582
       9583
        
         };

     

       9583
       9584
        
       

     

       9584
       9585
        
         simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };

+3 -3

pkgs/top-level/darwin-packages.nix

···

       6
       6
        
         generateSplicesForMkScope,

     

       7
       7
        
         makeScopeWithSplicing',

     

       8
       8
        
         stdenv,

     

       9
       9
       -
         preLibcCrossHeaders,

     

       10
       9
        
         config,

     

       11
       10
        
       }:

     

       12
       11
        
       

     
···

       57
       56
        
             };

     

       58
       57
        
       

     

       59
       58
        
             binutils = pkgs.wrapBintoolsWith {

     

       60
       60
       -
               libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;

     

       59
       59
       +
               libc =

     

       60
       60
       +
                 if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else pkgs.stdenv.cc.libc;

     

       61
       61
        
               bintools = self.binutils-unwrapped;

     

       62
       62
        
             };

     

       63
       63
        
       

     
···

       88
       88
        
             };

     

       89
       89
        
       

     

       90
       90
        
             binutilsNoLibc = pkgs.wrapBintoolsWith {

     

       91
       91
       -
               libc = preLibcCrossHeaders;

     

       91
       91
       +
               libc = targetPackages.preLibcHeaders;

     

       92
       92
        
               bintools = self.binutils-unwrapped;

     

       93
       93
        
             };

     

       94
       94

+2 -2

pkgs/top-level/release-cross.nix

···

       71
       71
        
         embedded = {

     

       72
       72
        
           buildPackages.binutils = nativePlatforms;

     

       73
       73
        
           buildPackages.gcc = nativePlatforms;

     

       74
       74
       -
           libcCross = nativePlatforms;

     

       74
       74
       +
           libc = nativePlatforms;

     

       75
       75
        
         };

     

       76
       76
        
       

     

       77
       77
        
         common = {

     

       78
       78
        
           buildPackages.binutils = nativePlatforms;

     

       79
       79
        
           gmp = nativePlatforms;

     

       80
       80
       -
           libcCross = nativePlatforms;

     

       80
       80
       +
           libc = nativePlatforms;

     

       81
       81
        
           nix = nativePlatforms;

     

       82
       82
        
           nixVersions.git = nativePlatforms;

     

       83
       83
        
           mesa = nativePlatforms;