public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63698 from tobim/overrideCC-buildPackages

Browse Source 
Fix misuses of overrideCC
This commit is contained in:
John Ericson 2019-06-23 18:19:18 -04:00 committed by GitHub
commit 852d81d607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/dpkg/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ perl zlib bzip2 xz ]; buildInputs = [ perl zlib bzip2 xz ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper perl ];
postInstall = postInstall =
'' ''

107
pkgs/top-level/all-packages.nix
View File

@ -677,7 +677,7 @@ in
apt = callPackage ../tools/package-management/apt { apt = callPackage ../tools/package-management/apt {
# include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
stdenv = overrideCC stdenv gcc5; stdenv = gcc5Stdenv;
}; };
apt-dater = callPackage ../tools/package-management/apt-dater { }; apt-dater = callPackage ../tools/package-management/apt-dater { };
@ -2813,7 +2813,7 @@ in
exa = callPackage ../tools/misc/exa { }; exa = callPackage ../tools/misc/exa { };
exempi = callPackage ../development/libraries/exempi { exempi = callPackage ../development/libraries/exempi {
stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv; stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;
}; };
execline = skawarePackages.execline; execline = skawarePackages.execline;
@ -3089,7 +3089,7 @@ in
fusuma = callPackage ../tools/inputmethods/fusuma {}; fusuma = callPackage ../tools/inputmethods/fusuma {};
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
stdenv49 = overrideCC stdenv gcc49; stdenv49 = gcc49Stdenv;
}); });
inherit (fdbPackages) inherit (fdbPackages)
@ -3258,7 +3258,7 @@ in
gnash = callPackage ../misc/gnash { }; gnash = callPackage ../misc/gnash { };
gnaural = callPackage ../applications/audio/gnaural { gnaural = callPackage ../applications/audio/gnaural {
stdenv = overrideCC stdenv gcc49; stdenv = gcc49Stdenv;
}; };
gnirehtet = callPackage ../tools/networking/gnirehtet { }; gnirehtet = callPackage ../tools/networking/gnirehtet { };
@ -3421,7 +3421,7 @@ in
grpcurl = callPackage ../tools/networking/grpcurl { }; grpcurl = callPackage ../tools/networking/grpcurl { };
grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
stdenv = overrideCC stdenv pkgsi686Linux.gcc6; stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6;
} // (config.grub or {})); } // (config.grub or {}));
trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
@ -6393,7 +6393,7 @@ in
udptunnel = callPackage ../tools/networking/udptunnel { }; udptunnel = callPackage ../tools/networking/udptunnel { };
ufraw = callPackage ../applications/graphics/ufraw { ufraw = callPackage ../applications/graphics/ufraw {
stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7 stdenv = gcc6Stdenv; # doesn't build with gcc7
}; };
uftrace = callPackage ../development/tools/uftrace { }; uftrace = callPackage ../development/tools/uftrace { };
@ -7104,7 +7104,7 @@ in
avian = callPackage ../development/compilers/avian { avian = callPackage ../development/compilers/avian {
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv; stdenv = if stdenv.cc.isGNU then gcc49Stdenv else stdenv;
}; };
bigloo = callPackage ../development/compilers/bigloo { }; bigloo = callPackage ../development/compilers/bigloo { };
@ -7164,7 +7164,7 @@ in
#Use this instead of stdenv to build with clang #Use this instead of stdenv to build with clang
clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack;
libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
clasp-common-lisp = callPackage ../development/compilers/clasp { clasp-common-lisp = callPackage ../development/compilers/clasp {
@ -7243,9 +7243,12 @@ in
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
}; };
gcc7Stdenv = overrideCC gccStdenv gcc7; gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49;
gcc8Stdenv = overrideCC gccStdenv gcc8; gcc5Stdenv = overrideCC gccStdenv buildPackages.gcc5;
gcc9Stdenv = overrideCC gccStdenv gcc9; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;
gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7;
gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
wrapCCMulti = cc: wrapCCMulti = cc:
if stdenv.targetPlatform.system == "x86_64-linux" then let if stdenv.targetPlatform.system == "x86_64-linux" then let
@ -7282,8 +7285,8 @@ in
gcc_multi = wrapCCMulti gcc; gcc_multi = wrapCCMulti gcc;
clang_multi = wrapClangMulti clang; clang_multi = wrapClangMulti clang;
gccMultiStdenv = overrideCC stdenv gcc_multi; gccMultiStdenv = overrideCC stdenv buildPackages.gcc_multi;
clangMultiStdenv = overrideCC stdenv clang_multi; clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi;
multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv;
gcc_debug = lowPrio (wrapCC (gcc.cc.override { gcc_debug = lowPrio (wrapCC (gcc.cc.override {
@ -7817,7 +7820,7 @@ in
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
isl = isl_0_14; isl = isl_0_14;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; stdenv = gcc6Stdenv;
}); });
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
@ -7825,7 +7828,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_38.tools; buildLlvmTools = buildPackages.llvmPackages_38.tools;
targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; stdenv = gcc6Stdenv;
}); });
llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
@ -7833,7 +7836,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_39.tools; buildLlvmTools = buildPackages.llvmPackages_39.tools;
targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; targetLlvmLibraries = targetPackages.llvmPackages_39.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; stdenv = gcc6Stdenv;
}); });
llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
@ -7841,7 +7844,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_4.tools; buildLlvmTools = buildPackages.llvmPackages_4.tools;
targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; targetLlvmLibraries = targetPackages.llvmPackages_4.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; stdenv = gcc6Stdenv;
}); });
llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
@ -7849,7 +7852,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_5.tools; buildLlvmTools = buildPackages.llvmPackages_5.tools;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
@ -7857,7 +7860,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_6.tools; buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({
@ -7865,7 +7868,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_7.tools; buildLlvmTools = buildPackages.llvmPackages_7.tools;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
} // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({ llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({
@ -7873,7 +7876,7 @@ in
buildLlvmTools = buildPackages.llvmPackages_8.tools; buildLlvmTools = buildPackages.llvmPackages_8.tools;
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
} // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_latest = llvmPackages_8; llvmPackages_latest = llvmPackages_8;
@ -7981,7 +7984,7 @@ in
pforth = callPackage ../development/compilers/pforth {}; pforth = callPackage ../development/compilers/pforth {};
picat = callPackage ../development/compilers/picat { picat = callPackage ../development/compilers/picat {
stdenv = overrideCC stdenv gcc49; stdenv = gcc49Stdenv;
}; };
ponyc = callPackage ../development/compilers/ponyc { ponyc = callPackage ../development/compilers/ponyc {
@ -8642,7 +8645,7 @@ in
spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
inherit (darwin) libobjc; inherit (darwin) libobjc;
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
@ -8895,7 +8898,7 @@ in
yacc = bison; # TODO: move to aliases.nix yacc = bison; # TODO: move to aliases.nix
blackmagic = callPackage ../development/tools/misc/blackmagic { blackmagic = callPackage ../development/tools/misc/blackmagic {
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
}; };
@ -8954,7 +8957,7 @@ in
# should be owned by user root, group nixbld with permissions 0770. # should be owned by user root, group nixbld with permissions 0770.
ccacheWrapper = makeOverridable ({ extraConfig ? "" }: ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
wrapCC (ccache.links extraConfig)) {}; wrapCC (ccache.links extraConfig)) {};
ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
cccc = callPackage ../development/tools/analysis/cccc { }; cccc = callPackage ../development/tools/analysis/cccc { };
@ -9122,7 +9125,7 @@ in
# #
distccWrapper = makeOverridable ({ extraConfig ? "" }: distccWrapper = makeOverridable ({ extraConfig ? "" }:
wrapCC (distcc.links extraConfig)) {}; wrapCC (distcc.links extraConfig)) {};
distccStdenv = lowPrio (overrideCC stdenv distccWrapper); distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper);
distccMasquerade = if stdenv.isDarwin distccMasquerade = if stdenv.isDarwin
then null then null
@ -10952,27 +10955,27 @@ in
nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
} // } //
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu59 = callPackage ../development/libraries/icu/59.nix ({ icu59 = callPackage ../development/libraries/icu/59.nix ({
nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu60 = callPackage ../development/libraries/icu/60.nix ({ icu60 = callPackage ../development/libraries/icu/60.nix ({
nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu63 = callPackage ../development/libraries/icu/63.nix ({ icu63 = callPackage ../development/libraries/icu/63.nix ({
nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu64 = callPackage ../development/libraries/icu/64.nix ({ icu64 = callPackage ../development/libraries/icu/64.nix ({
nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu = icu64; icu = icu64;
@ -12523,7 +12526,7 @@ in
opal = callPackage ../development/libraries/opal { opal = callPackage ../development/libraries/opal {
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
openh264 = callPackage ../development/libraries/openh264 { }; openh264 = callPackage ../development/libraries/openh264 { };
@ -13532,13 +13535,13 @@ in
v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
inherit (python2Packages) python gyp; inherit (python2Packages) python gyp;
cctools = darwin.cctools; cctools = darwin.cctools;
stdenv = overrideCC stdenv gcc5; stdenv = gcc5Stdenv;
}; };
v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
inherit (python2Packages) python gyp; inherit (python2Packages) python gyp;
cctools = darwin.cctools; cctools = darwin.cctools;
stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; stdenv = if stdenv.isDarwin then stdenv else gcc5Stdenv;
}; };
v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({
@ -13546,7 +13549,7 @@ in
icu = icu58; # v8-5.4.232 fails against icu4c-59.1 icu = icu58; # v8-5.4.232 fails against icu4c-59.1
} // lib.optionalAttrs stdenv.isLinux { } // lib.optionalAttrs stdenv.isLinux {
# doesn't build with gcc7 # doesn't build with gcc7
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}); });
v8_6_x = v8; v8_6_x = v8;
@ -13554,7 +13557,7 @@ in
inherit (python2Packages) python; inherit (python2Packages) python;
} // lib.optionalAttrs stdenv.isLinux { } // lib.optionalAttrs stdenv.isLinux {
# doesn't build with gcc7 # doesn't build with gcc7
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
@ -13638,7 +13641,7 @@ in
vxl = callPackage ../development/libraries/vxl { vxl = callPackage ../development/libraries/vxl {
libpng = libpng12; libpng = libpng12;
stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
}; };
wavpack = callPackage ../development/libraries/wavpack { }; wavpack = callPackage ../development/libraries/wavpack { };
@ -13656,7 +13659,7 @@ in
webkitgtk = callPackage ../development/libraries/webkitgtk { webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull; harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
@ -14240,8 +14243,8 @@ in
fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; };
firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; };
foswiki = callPackage ../servers/foswiki { }; foswiki = callPackage ../servers/foswiki { };
@ -15217,7 +15220,7 @@ in
kmscube = callPackage ../os-specific/linux/kmscube { }; kmscube = callPackage ../os-specific/linux/kmscube { };
kmsxx = callPackage ../development/libraries/kmsxx { kmsxx = callPackage ../development/libraries/kmsxx {
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
latencytop = callPackage ../os-specific/linux/latencytop { }; latencytop = callPackage ../os-specific/linux/latencytop { };
@ -16816,7 +16819,7 @@ in
afterstep = callPackage ../applications/window-managers/afterstep { afterstep = callPackage ../applications/window-managers/afterstep {
fltk = fltk13; fltk = fltk13;
gtk = gtk2; gtk = gtk2;
stdenv = overrideCC stdenv gcc49; stdenv = gcc49Stdenv;
}; };
agedu = callPackage ../tools/misc/agedu { }; agedu = callPackage ../tools/misc/agedu { };
@ -17056,7 +17059,7 @@ in
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
pythonPackages = python35Packages; pythonPackages = python35Packages;
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
bluefish = callPackage ../applications/editors/bluefish { bluefish = callPackage ../applications/editors/bluefish {
@ -17101,7 +17104,7 @@ in
calf = callPackage ../applications/audio/calf { calf = callPackage ../applications/audio/calf {
inherit (gnome2) libglade; inherit (gnome2) libglade;
stdenv = overrideCC stdenv gcc5; stdenv = gcc5Stdenv;
}; };
calcurse = callPackage ../applications/misc/calcurse { }; calcurse = callPackage ../applications/misc/calcurse { };
@ -18647,7 +18650,7 @@ in
k3d = callPackage ../applications/graphics/k3d { k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext; inherit (pkgs.gnome2) gtkglext;
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
boost = boost166.override { enablePython = true; }; boost = boost166.override { enablePython = true; };
}; };
@ -19081,7 +19084,7 @@ in
}; };
xmr-stak = callPackage ../applications/misc/xmr-stak { xmr-stak = callPackage ../applications/misc/xmr-stak {
stdenvGcc6 = overrideCC stdenv gcc6; stdenvGcc6 = gcc6Stdenv;
}; };
xmrig = callPackage ../applications/misc/xmrig { }; xmrig = callPackage ../applications/misc/xmrig { };
@ -19369,7 +19372,7 @@ in
maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
maxscale = callPackage ../tools/networking/maxscale { maxscale = callPackage ../tools/networking/maxscale {
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
pdfdiff = callPackage ../applications/misc/pdfdiff { }; pdfdiff = callPackage ../applications/misc/pdfdiff { };
@ -19480,7 +19483,7 @@ in
openfx = callPackage ../development/libraries/openfx {}; openfx = callPackage ../development/libraries/openfx {};
openimageio = callPackage ../applications/graphics/openimageio { openimageio = callPackage ../applications/graphics/openimageio {
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
@ -19536,7 +19539,7 @@ in
palemoon = callPackage ../applications/networking/browsers/palemoon { palemoon = callPackage ../applications/networking/browsers/palemoon {
# https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
stdenv = overrideCC stdenv gcc49; stdenv = gcc49Stdenv;
}; };
pamix = callPackage ../applications/audio/pamix { }; pamix = callPackage ../applications/audio/pamix { };
@ -21324,7 +21327,7 @@ in
arena = callPackage ../games/arena {}; arena = callPackage ../games/arena {};
arx-libertatis = callPackage ../games/arx-libertatis { arx-libertatis = callPackage ../games/arx-libertatis {
stdenv = overrideCC stdenv gcc6; stdenv = gcc6Stdenv;
}; };
asc = callPackage ../games/asc { asc = callPackage ../games/asc {
@ -22328,7 +22331,7 @@ in
aragorn = callPackage ../applications/science/biology/aragorn { }; aragorn = callPackage ../applications/science/biology/aragorn { };
archimedes = callPackage ../applications/science/electronics/archimedes { archimedes = callPackage ../applications/science/electronics/archimedes {
stdenv = overrideCC stdenv gcc49; stdenv = gcc49Stdenv;
}; };
bedtools = callPackage ../applications/science/biology/bedtools { }; bedtools = callPackage ../applications/science/biology/bedtools { };
@ -23235,7 +23238,7 @@ in
dumb = callPackage ../misc/dumb { }; dumb = callPackage ../misc/dumb { };
emulationstation = callPackage ../misc/emulators/emulationstation { emulationstation = callPackage ../misc/emulators/emulationstation {
stdenv = overrideCC stdenv gcc5; stdenv = gcc5Stdenv;
}; };
electricsheep = callPackage ../misc/screensavers/electricsheep { }; electricsheep = callPackage ../misc/screensavers/electricsheep { };