Fix overrideCC invokations for cross builds
`overrideCC` should always take a compiler for the build system, otherwise cross compilation is not possible.
This commit is contained in:
parent
79d72ccd3c
commit
3a7bb25285
@ -671,7 +671,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 = overrideCC stdenv buildPackages.gcc5;
|
||||||
};
|
};
|
||||||
|
|
||||||
apt-dater = callPackage ../tools/package-management/apt-dater { };
|
apt-dater = callPackage ../tools/package-management/apt-dater { };
|
||||||
@ -2805,7 +2805,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 overrideCC stdenv buildPackages.gcc6 else stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
execline = skawarePackages.execline;
|
execline = skawarePackages.execline;
|
||||||
@ -3081,7 +3081,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
});
|
});
|
||||||
|
|
||||||
inherit (fdbPackages)
|
inherit (fdbPackages)
|
||||||
@ -3250,7 +3250,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
};
|
};
|
||||||
|
|
||||||
gnirehtet = callPackage ../tools/networking/gnirehtet { };
|
gnirehtet = callPackage ../tools/networking/gnirehtet { };
|
||||||
@ -3413,7 +3413,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 { };
|
||||||
@ -6381,7 +6381,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 = overrideCC stdenv buildPackages.gcc6; # doesn't build with gcc7
|
||||||
};
|
};
|
||||||
|
|
||||||
uftrace = callPackage ../development/tools/uftrace { };
|
uftrace = callPackage ../development/tools/uftrace { };
|
||||||
@ -7090,7 +7090,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 overrideCC stdenv buildPackages.gcc49 else stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
bigloo = callPackage ../development/compilers/bigloo { };
|
bigloo = callPackage ../development/compilers/bigloo { };
|
||||||
@ -7150,7 +7150,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 {
|
||||||
@ -7229,9 +7229,9 @@ in
|
|||||||
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
|
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
|
||||||
};
|
};
|
||||||
|
|
||||||
gcc7Stdenv = overrideCC gccStdenv gcc7;
|
gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7;
|
||||||
gcc8Stdenv = overrideCC gccStdenv gcc8;
|
gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
|
||||||
gcc9Stdenv = overrideCC gccStdenv gcc9;
|
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
|
||||||
@ -7268,8 +7268,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 {
|
||||||
@ -7967,7 +7967,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
};
|
};
|
||||||
|
|
||||||
ponyc = callPackage ../development/compilers/ponyc {
|
ponyc = callPackage ../development/compilers/ponyc {
|
||||||
@ -8625,7 +8625,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 = overrideCC stdenv buildPackages.gcc6; # 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 { };
|
||||||
@ -8878,7 +8878,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
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;
|
||||||
};
|
};
|
||||||
@ -8937,7 +8937,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 { };
|
||||||
|
|
||||||
@ -9103,7 +9103,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
|
||||||
@ -10922,27 +10922,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 = overrideCC stdenv buildPackages.gcc6; # 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 = overrideCC stdenv buildPackages.gcc6; # 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 = overrideCC stdenv buildPackages.gcc6; # 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 = overrideCC stdenv buildPackages.gcc6; # 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 = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
||||||
}));
|
}));
|
||||||
|
|
||||||
icu = icu64;
|
icu = icu64;
|
||||||
@ -12495,7 +12495,7 @@ in
|
|||||||
|
|
||||||
opal = callPackage ../development/libraries/opal {
|
opal = callPackage ../development/libraries/opal {
|
||||||
ffmpeg = ffmpeg_2;
|
ffmpeg = ffmpeg_2;
|
||||||
stdenv = overrideCC stdenv gcc6;
|
stdenv = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
openh264 = callPackage ../development/libraries/openh264 { };
|
openh264 = callPackage ../development/libraries/openh264 { };
|
||||||
@ -13505,13 +13505,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 = overrideCC stdenv buildPackages.gcc5;
|
||||||
};
|
};
|
||||||
|
|
||||||
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 overrideCC stdenv buildPackages.gcc5;
|
||||||
};
|
};
|
||||||
|
|
||||||
v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({
|
v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({
|
||||||
@ -13519,7 +13519,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
});
|
});
|
||||||
|
|
||||||
v8_6_x = v8;
|
v8_6_x = v8;
|
||||||
@ -13527,7 +13527,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
|
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
|
||||||
@ -13611,7 +13611,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 = overrideCC stdenv buildPackages.gcc6; # upstream code incompatible with gcc7
|
||||||
};
|
};
|
||||||
|
|
||||||
wavpack = callPackage ../development/libraries/wavpack { };
|
wavpack = callPackage ../development/libraries/wavpack { };
|
||||||
@ -13629,7 +13629,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
|
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
|
||||||
@ -14215,8 +14215,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 = overrideCC stdenv buildPackages.gcc5; };
|
||||||
firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
|
firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv buildPackages.gcc5; };
|
||||||
|
|
||||||
foswiki = callPackage ../servers/foswiki { };
|
foswiki = callPackage ../servers/foswiki { };
|
||||||
|
|
||||||
@ -15190,7 +15190,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
latencytop = callPackage ../os-specific/linux/latencytop { };
|
latencytop = callPackage ../os-specific/linux/latencytop { };
|
||||||
@ -16783,7 +16783,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
};
|
};
|
||||||
|
|
||||||
agedu = callPackage ../tools/misc/agedu { };
|
agedu = callPackage ../tools/misc/agedu { };
|
||||||
@ -17024,7 +17024,7 @@ in
|
|||||||
|
|
||||||
blender = callPackage ../applications/misc/blender {
|
blender = callPackage ../applications/misc/blender {
|
||||||
pythonPackages = python35Packages;
|
pythonPackages = python35Packages;
|
||||||
stdenv = overrideCC stdenv gcc6;
|
stdenv = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
bluefish = callPackage ../applications/editors/bluefish {
|
bluefish = callPackage ../applications/editors/bluefish {
|
||||||
@ -17069,7 +17069,7 @@ in
|
|||||||
|
|
||||||
calf = callPackage ../applications/audio/calf {
|
calf = callPackage ../applications/audio/calf {
|
||||||
inherit (gnome2) libglade;
|
inherit (gnome2) libglade;
|
||||||
stdenv = overrideCC stdenv gcc5;
|
stdenv = overrideCC stdenv buildPackages.gcc5;
|
||||||
};
|
};
|
||||||
|
|
||||||
calcurse = callPackage ../applications/misc/calcurse { };
|
calcurse = callPackage ../applications/misc/calcurse { };
|
||||||
@ -18611,7 +18611,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
boost = boost166.override { enablePython = true; };
|
boost = boost166.override { enablePython = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -19046,7 +19046,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
xmr-stak = callPackage ../applications/misc/xmr-stak {
|
xmr-stak = callPackage ../applications/misc/xmr-stak {
|
||||||
stdenvGcc6 = overrideCC stdenv gcc6;
|
stdenvGcc6 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
xmrig = callPackage ../applications/misc/xmrig { };
|
xmrig = callPackage ../applications/misc/xmrig { };
|
||||||
@ -19334,7 +19334,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
pdfdiff = callPackage ../applications/misc/pdfdiff { };
|
pdfdiff = callPackage ../applications/misc/pdfdiff { };
|
||||||
@ -19445,7 +19445,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
|
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
|
||||||
@ -19501,7 +19501,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
};
|
};
|
||||||
|
|
||||||
pamix = callPackage ../applications/audio/pamix { };
|
pamix = callPackage ../applications/audio/pamix { };
|
||||||
@ -21284,7 +21284,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 = overrideCC stdenv buildPackages.gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
asc = callPackage ../games/asc {
|
asc = callPackage ../games/asc {
|
||||||
@ -22288,7 +22288,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 = overrideCC stdenv buildPackages.gcc49;
|
||||||
};
|
};
|
||||||
|
|
||||||
bedtools = callPackage ../applications/science/biology/bedtools { };
|
bedtools = callPackage ../applications/science/biology/bedtools { };
|
||||||
@ -23191,7 +23191,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 = overrideCC stdenv buildPackages.gcc5;
|
||||||
};
|
};
|
||||||
|
|
||||||
electricsheep = callPackage ../misc/screensavers/electricsheep { };
|
electricsheep = callPackage ../misc/screensavers/electricsheep { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user