@@ -677,7 +677,7 @@ in
677677
678678 apt = callPackage ../tools/package-management/apt {
679679 # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
680− stdenv = overrideCC stdenv gcc5;
680+ stdenv = gcc5Stdenv;
681681 };
682682
683683 apt-dater = callPackage ../tools/package-management/apt-dater { };
@@ -2813,7 +2813,7 @@ in
28132813 exa = callPackage ../tools/misc/exa { };
28142814
28152815 exempi = callPackage ../development/libraries/exempi {
2816− stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv;
2816+ stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;
28172817 };
28182818
28192819 execline = skawarePackages.execline;
@@ -3089,7 +3089,7 @@ in
30893089 fusuma = callPackage ../tools/inputmethods/fusuma {};
30903090
30913091 fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
3092− stdenv49 = overrideCC stdenv gcc49;
3092+ stdenv49 = gcc49Stdenv;
30933093 });
30943094
30953095 inherit (fdbPackages)
@@ -3258,7 +3258,7 @@ in
32583258 gnash = callPackage ../misc/gnash { };
32593259
32603260 gnaural = callPackage ../applications/audio/gnaural {
3261− stdenv = overrideCC stdenv gcc49;
3261+ stdenv = gcc49Stdenv;
32623262 };
32633263
32643264 gnirehtet = callPackage ../tools/networking/gnirehtet { };
@@ -3421,7 +3421,7 @@ in
34213421 grpcurl = callPackage ../tools/networking/grpcurl { };
34223422
34233423 grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
3424− stdenv = overrideCC stdenv pkgsi686Linux.gcc6;
3424+ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
34253425 } // (config.grub or {}));
34263426
34273427 trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
@@ -6393,7 +6393,7 @@ in
63936393 udptunnel = callPackage ../tools/networking/udptunnel { };
63946394
63956395 ufraw = callPackage ../applications/graphics/ufraw {
6396− stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7
6396+ stdenv = gcc6Stdenv; # doesn't build with gcc7
63976397 };
63986398
63996399 uftrace = callPackage ../development/tools/uftrace { };
@@ -7104,7 +7104,7 @@ in
71047104
71057105 avian = callPackage ../development/compilers/avian {
71067106 inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
7107− stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv;
7107+ stdenv = if stdenv.cc.isGNU then gcc49Stdenv else stdenv;
71087108 };
71097109
71107110 bigloo = callPackage ../development/compilers/bigloo { };
@@ -7164,7 +7164,7 @@ in
71647164
71657165 #Use this instead of stdenv to build with clang
71667166 clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
7167− clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack;
7167+ clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack;
71687168 libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
71697169
71707170 clasp-common-lisp = callPackage ../development/compilers/clasp {
@@ -7243,9 +7243,12 @@ in
72437243 extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
72447244 };
72457245
7246− gcc7Stdenv = overrideCC gccStdenv gcc7;
7247− gcc8Stdenv = overrideCC gccStdenv gcc8;
7248− gcc9Stdenv = overrideCC gccStdenv gcc9;
7246+ gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49;
7247+ gcc5Stdenv = overrideCC gccStdenv buildPackages.gcc5;
7248+ gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;
7249+ gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7;
7250+ gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
7251+ gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
72497252
72507253 wrapCCMulti = cc:
72517254 if stdenv.targetPlatform.system == "x86_64-linux" then let
@@ -7282,8 +7285,8 @@ in
72827285 gcc_multi = wrapCCMulti gcc;
72837286 clang_multi = wrapClangMulti clang;
72847287
7285− gccMultiStdenv = overrideCC stdenv gcc_multi;
7286− clangMultiStdenv = overrideCC stdenv clang_multi;
7288+ gccMultiStdenv = overrideCC stdenv buildPackages.gcc_multi;
7289+ clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi;
72877290 multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv;
72887291
72897292 gcc_debug = lowPrio (wrapCC (gcc.cc.override {
@@ -7817,7 +7820,7 @@ in
78177820 llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
78187821 isl = isl_0_14;
78197822 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7820− stdenv = overrideCC stdenv buildPackages.gcc6;
7823+ stdenv = gcc6Stdenv;
78217824 });
78227825
78237826 llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
@@ -7825,7 +7828,7 @@ in
78257828 buildLlvmTools = buildPackages.llvmPackages_38.tools;
78267829 targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
78277830 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7828− stdenv = overrideCC stdenv buildPackages.gcc6;
7831+ stdenv = gcc6Stdenv;
78297832 });
78307833
78317834 llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
@@ -7833,7 +7836,7 @@ in
78337836 buildLlvmTools = buildPackages.llvmPackages_39.tools;
78347837 targetLlvmLibraries = targetPackages.llvmPackages_39.libraries;
78357838 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7836− stdenv = overrideCC stdenv buildPackages.gcc6;
7839+ stdenv = gcc6Stdenv;
78377840 });
78387841
78397842 llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
@@ -7841,7 +7844,7 @@ in
78417844 buildLlvmTools = buildPackages.llvmPackages_4.tools;
78427845 targetLlvmLibraries = targetPackages.llvmPackages_4.libraries;
78437846 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7844− stdenv = overrideCC stdenv buildPackages.gcc6;
7847+ stdenv = gcc6Stdenv;
78457848 });
78467849
78477850 llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
@@ -7849,7 +7852,7 @@ in
78497852 buildLlvmTools = buildPackages.llvmPackages_5.tools;
78507853 targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
78517854 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7852− stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
7855+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
78537856 });
78547857
78557858 llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
@@ -7857,7 +7860,7 @@ in
78577860 buildLlvmTools = buildPackages.llvmPackages_6.tools;
78587861 targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
78597862 } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7860− stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
7863+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
78617864 });
78627865
78637866 llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({
@@ -7865,7 +7868,7 @@ in
78657868 buildLlvmTools = buildPackages.llvmPackages_7.tools;
78667869 targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
78677870 } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7868− stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
7871+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
78697872 });
78707873
78717874 llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({
@@ -7873,7 +7876,7 @@ in
78737876 buildLlvmTools = buildPackages.llvmPackages_8.tools;
78747877 targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
78757878 } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7876− stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
7879+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
78777880 });
78787881
78797882 llvmPackages_latest = llvmPackages_8;
@@ -7981,7 +7984,7 @@ in
79817984 pforth = callPackage ../development/compilers/pforth {};
79827985
79837986 picat = callPackage ../development/compilers/picat {
7984− stdenv = overrideCC stdenv gcc49;
7987+ stdenv = gcc49Stdenv;
79857988 };
79867989
79877990 ponyc = callPackage ../development/compilers/ponyc {
@@ -8642,7 +8645,7 @@ in
86428645 spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
86438646 inherit (darwin) libobjc;
86448647 } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
8645− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
8648+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
86468649 }));
86478650 spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
86488651 spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
@@ -8895,7 +8898,7 @@ in
88958898 yacc = bison; # TODO: move to aliases.nix
88968899
88978900 blackmagic = callPackage ../development/tools/misc/blackmagic {
8898− stdenv = overrideCC stdenv gcc6;
8901+ stdenv = gcc6Stdenv;
88998902 gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
89008903 binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
89018904 };
@@ -8954,7 +8957,7 @@ in
89548957 # should be owned by user root, group nixbld with permissions 0770.
89558958 ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
89568959 wrapCC (ccache.links extraConfig)) {};
8957− ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper);
8960+ ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
89588961
89598962 cccc = callPackage ../development/tools/analysis/cccc { };
89608963
@@ -9122,7 +9125,7 @@ in
91229125 #
91239126 distccWrapper = makeOverridable ({ extraConfig ? "" }:
91249127 wrapCC (distcc.links extraConfig)) {};
9125− distccStdenv = lowPrio (overrideCC stdenv distccWrapper);
9128+ distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper);
91269129
91279130 distccMasquerade = if stdenv.isDarwin
91289131 then null
@@ -10952,27 +10955,27 @@ in
1095210955 nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
1095310956 } //
1095410957 (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
10955− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
10958+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1095610959 }));
1095710960 icu59 = callPackage ../development/libraries/icu/59.nix ({
1095810961 nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; };
1095910962 } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
10960− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
10963+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1096110964 }));
1096210965 icu60 = callPackage ../development/libraries/icu/60.nix ({
1096310966 nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; };
1096410967 } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
10965− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
10968+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1096610969 }));
1096710970 icu63 = callPackage ../development/libraries/icu/63.nix ({
1096810971 nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; };
1096910972 } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
10970− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
10973+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1097110974 }));
1097210975 icu64 = callPackage ../development/libraries/icu/64.nix ({
1097310976 nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; };
1097410977 } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
10975− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
10978+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1097610979 }));
1097710980
1097810981 icu = icu64;
@@ -12523,7 +12526,7 @@ in
1252312526
1252412527 opal = callPackage ../development/libraries/opal {
1252512528 ffmpeg = ffmpeg_2;
12526− stdenv = overrideCC stdenv gcc6;
12529+ stdenv = gcc6Stdenv;
1252712530 };
1252812531
1252912532 openh264 = callPackage ../development/libraries/openh264 { };
@@ -13532,13 +13535,13 @@ in
1353213535 v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
1353313536 inherit (python2Packages) python gyp;
1353413537 cctools = darwin.cctools;
13535− stdenv = overrideCC stdenv gcc5;
13538+ stdenv = gcc5Stdenv;
1353613539 };
1353713540
1353813541 v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
1353913542 inherit (python2Packages) python gyp;
1354013543 cctools = darwin.cctools;
13541− stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5;
13544+ stdenv = if stdenv.isDarwin then stdenv else gcc5Stdenv;
1354213545 };
1354313546
1354413547 v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({
@@ -13546,7 +13549,7 @@ in
1354613549 icu = icu58; # v8-5.4.232 fails against icu4c-59.1
1354713550 } // lib.optionalAttrs stdenv.isLinux {
1354813551 # doesn't build with gcc7
13549− stdenv = overrideCC stdenv gcc6;
13552+ stdenv = gcc6Stdenv;
1355013553 });
1355113554
1355213555 v8_6_x = v8;
@@ -13554,7 +13557,7 @@ in
1355413557 inherit (python2Packages) python;
1355513558 } // lib.optionalAttrs stdenv.isLinux {
1355613559 # doesn't build with gcc7
13557− stdenv = overrideCC stdenv gcc6;
13560+ stdenv = gcc6Stdenv;
1355813561 };
1355913562
1356013563 vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
@@ -13638,7 +13641,7 @@ in
1363813641
1363913642 vxl = callPackage ../development/libraries/vxl {
1364013643 libpng = libpng12;
13641− stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7
13644+ stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
1364213645 };
1364313646
1364413647 wavpack = callPackage ../development/libraries/wavpack { };
@@ -13656,7 +13659,7 @@ in
1365613659 webkitgtk = callPackage ../development/libraries/webkitgtk {
1365713660 harfbuzz = harfbuzzFull;
1365813661 inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
13659− stdenv = overrideCC stdenv gcc6;
13662+ stdenv = gcc6Stdenv;
1366013663 };
1366113664
1366213665 webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
@@ -14240,8 +14243,8 @@ in
1424014243
1424114244 fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
1424214245
14243− firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; };
14244− firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
14246+ firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; };
14247+ firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; };
1424514248
1424614249 foswiki = callPackage ../servers/foswiki { };
1424714250
@@ -15217,7 +15220,7 @@ in
1521715220 kmscube = callPackage ../os-specific/linux/kmscube { };
1521815221
1521915222 kmsxx = callPackage ../development/libraries/kmsxx {
15220− stdenv = overrideCC stdenv gcc6;
15223+ stdenv = gcc6Stdenv;
1522115224 };
1522215225
1522315226 latencytop = callPackage ../os-specific/linux/latencytop { };
@@ -16816,7 +16819,7 @@ in
1681616819 afterstep = callPackage ../applications/window-managers/afterstep {
1681716820 fltk = fltk13;
1681816821 gtk = gtk2;
16819− stdenv = overrideCC stdenv gcc49;
16822+ stdenv = gcc49Stdenv;
1682016823 };
1682116824
1682216825 agedu = callPackage ../tools/misc/agedu { };
@@ -17056,7 +17059,7 @@ in
1705617059
1705717060 blender = callPackage ../applications/misc/blender {
1705817061 pythonPackages = python35Packages;
17059− stdenv = overrideCC stdenv gcc6;
17062+ stdenv = gcc6Stdenv;
1706017063 };
1706117064
1706217065 bluefish = callPackage ../applications/editors/bluefish {
@@ -17101,7 +17104,7 @@ in
1710117104
1710217105 calf = callPackage ../applications/audio/calf {
1710317106 inherit (gnome2) libglade;
17104− stdenv = overrideCC stdenv gcc5;
17107+ stdenv = gcc5Stdenv;
1710517108 };
1710617109
1710717110 calcurse = callPackage ../applications/misc/calcurse { };
@@ -18647,7 +18650,7 @@ in
1864718650
1864818651 k3d = callPackage ../applications/graphics/k3d {
1864918652 inherit (pkgs.gnome2) gtkglext;
18650− stdenv = overrideCC stdenv gcc6;
18653+ stdenv = gcc6Stdenv;
1865118654 boost = boost166.override { enablePython = true; };
1865218655 };
1865318656
@@ -19081,7 +19084,7 @@ in
1908119084 };
1908219085
1908319086 xmr-stak = callPackage ../applications/misc/xmr-stak {
19084− stdenvGcc6 = overrideCC stdenv gcc6;
19087+ stdenvGcc6 = gcc6Stdenv;
1908519088 };
1908619089
1908719090 xmrig = callPackage ../applications/misc/xmrig { };
@@ -19369,7 +19372,7 @@ in
1936919372 maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
1937019373
1937119374 maxscale = callPackage ../tools/networking/maxscale {
19372− stdenv = overrideCC stdenv gcc6;
19375+ stdenv = gcc6Stdenv;
1937319376 };
1937419377
1937519378 pdfdiff = callPackage ../applications/misc/pdfdiff { };
@@ -19480,7 +19483,7 @@ in
1948019483 openfx = callPackage ../development/libraries/openfx {};
1948119484
1948219485 openimageio = callPackage ../applications/graphics/openimageio {
19483− stdenv = overrideCC stdenv gcc6;
19486+ stdenv = gcc6Stdenv;
1948419487 };
1948519488
1948619489 openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
@@ -19536,7 +19539,7 @@ in
1953619539
1953719540 palemoon = callPackage ../applications/networking/browsers/palemoon {
1953819541 # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
19539− stdenv = overrideCC stdenv gcc49;
19542+ stdenv = gcc49Stdenv;
1954019543 };
1954119544
1954219545 pamix = callPackage ../applications/audio/pamix { };
@@ -21324,7 +21327,7 @@ in
2132421327 arena = callPackage ../games/arena {};
2132521328
2132621329 arx-libertatis = callPackage ../games/arx-libertatis {
21327− stdenv = overrideCC stdenv gcc6;
21330+ stdenv = gcc6Stdenv;
2132821331 };
2132921332
2133021333 asc = callPackage ../games/asc {
@@ -22328,7 +22331,7 @@ in
2232822331 aragorn = callPackage ../applications/science/biology/aragorn { };
2232922332
2233022333 archimedes = callPackage ../applications/science/electronics/archimedes {
22331− stdenv = overrideCC stdenv gcc49;
22334+ stdenv = gcc49Stdenv;
2233222335 };
2233322336
2233422337 bedtools = callPackage ../applications/science/biology/bedtools { };
@@ -23235,7 +23238,7 @@ in
2323523238 dumb = callPackage ../misc/dumb { };
2323623239
2323723240 emulationstation = callPackage ../misc/emulators/emulationstation {
23238− stdenv = overrideCC stdenv gcc5;
23241+ stdenv = gcc5Stdenv;
2323923242 };
2324023243
2324123244 electricsheep = callPackage ../misc/screensavers/electricsheep { };