forked from mirrors/nixpkgs
Merge pull request #175177 from NixOS/fix-all-gcc10-packages
Fix packages broken by gcc 10->11 update
This commit is contained in:
Alexander Bantyev
GitHub
commit
7c59ac9ddc
|
|
@ -389,7 +389,7 @@ with pkgs;
|
|||
|
||||
gpick = callPackage ../tools/misc/gpick { };
|
||||
|
||||
hobbes = callPackage ../development/tools/hobbes { };
|
||||
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
|
||||
|
||||
|
|
@ -992,7 +992,7 @@ with pkgs;
|
|||
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
|
||||
boost = boost16x; # checkPhase fails with Boost 1.77
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
adminer = callPackage ../servers/adminer { };
|
||||
|
|
@ -1628,7 +1628,7 @@ with pkgs;
|
|||
|
||||
writefreely = callPackage ../applications/misc/writefreely { };
|
||||
|
||||
iqueue = callPackage ../development/libraries/iqueue { };
|
||||
iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
lifecycled = callPackage ../tools/misc/lifecycled { };
|
||||
|
||||
|
|
@ -2021,7 +2021,7 @@ with pkgs;
|
|||
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
|
||||
|
||||
bonnie = callPackage ../tools/filesystems/bonnie {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
botamusique = callPackage ../tools/audio/botamusique { };
|
||||
|
|
@ -2142,7 +2142,7 @@ with pkgs;
|
|||
|
||||
dfmt = callPackage ../tools/text/dfmt { };
|
||||
|
||||
diopser = callPackage ../applications/audio/diopser { };
|
||||
diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
diskonaut = callPackage ../tools/misc/diskonaut { };
|
||||
|
||||
|
|
@ -2242,7 +2242,7 @@ with pkgs;
|
|||
|
||||
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
|
||||
|
||||
gammy = qt5.callPackage ../tools/misc/gammy { };
|
||||
gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gams = callPackage ../tools/misc/gams (config.gams or {});
|
||||
|
||||
|
|
@ -3010,7 +3010,7 @@ with pkgs;
|
|||
|
||||
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
|
||||
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
|
||||
clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
|
||||
|
||||
|
|
@ -3339,7 +3339,7 @@ with pkgs;
|
|||
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
|
||||
};
|
||||
|
||||
djv = callPackage ../applications/graphics/djv { };
|
||||
djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
|
||||
|
||||
|
|
@ -4740,7 +4740,7 @@ with pkgs;
|
|||
|
||||
evscript = callPackage ../tools/inputmethods/evscript { };
|
||||
|
||||
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
|
||||
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
kime = callPackage ../tools/inputmethods/kime { };
|
||||
|
||||
|
|
@ -4971,7 +4971,7 @@ with pkgs;
|
|||
createrepo_c = callPackage ../tools/package-management/createrepo_c { };
|
||||
|
||||
cromfs = callPackage ../tools/archivers/cromfs {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
cron = callPackage ../tools/system/cron { };
|
||||
|
|
@ -5623,7 +5623,7 @@ with pkgs;
|
|||
|
||||
endlessh-go = callPackage ../servers/endlessh-go { };
|
||||
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { };
|
||||
ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cryfs = callPackage ../tools/filesystems/cryfs { };
|
||||
|
||||
|
|
@ -6655,7 +6655,7 @@ with pkgs;
|
|||
|
||||
robodoc = callPackage ../tools/text/robodoc { };
|
||||
|
||||
ucg = callPackage ../tools/text/ucg { };
|
||||
ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
grive2 = callPackage ../tools/filesystems/grive2 { };
|
||||
|
||||
|
|
@ -6736,9 +6736,8 @@ with pkgs;
|
|||
|
||||
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
|
||||
|
||||
gsmlib = callPackage ../development/libraries/gsmlib {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
gsmlib = callPackage ../development/libraries/gsmlib
|
||||
{ stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; };
|
||||
|
||||
gssdp = callPackage ../development/libraries/gssdp { };
|
||||
|
||||
|
|
@ -7227,7 +7226,7 @@ with pkgs;
|
|||
boost = boost16x;
|
||||
};
|
||||
|
||||
isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
|
||||
isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
isync = callPackage ../tools/networking/isync {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
@ -8132,7 +8131,7 @@ with pkgs;
|
|||
|
||||
lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
|
||||
|
||||
loki = callPackage ../development/libraries/loki { };
|
||||
loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
longview = callPackage ../servers/monitoring/longview { };
|
||||
|
||||
|
|
@ -8370,7 +8369,7 @@ with pkgs;
|
|||
|
||||
mkclean = callPackage ../applications/video/mkclean {};
|
||||
|
||||
mkcue = callPackage ../tools/cd-dvd/mkcue { };
|
||||
mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
mkp224o = callPackage ../tools/security/mkp224o { };
|
||||
|
||||
|
|
@ -8922,9 +8921,8 @@ with pkgs;
|
|||
|
||||
ola = callPackage ../applications/misc/ola { };
|
||||
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
||||
};
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
|
||||
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
|
||||
|
||||
ombi = callPackage ../servers/ombi { };
|
||||
|
||||
|
|
@ -8956,7 +8954,7 @@ with pkgs;
|
|||
|
||||
opencryptoki = callPackage ../tools/security/opencryptoki { };
|
||||
|
||||
opendbx = callPackage ../development/libraries/opendbx { };
|
||||
opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
opendht = callPackage ../development/libraries/opendht {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
@ -9222,12 +9220,10 @@ with pkgs;
|
|||
perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
|
||||
|
||||
percona-xtrabackup = percona-xtrabackup_8_0;
|
||||
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix {
|
||||
boost = boost159;
|
||||
};
|
||||
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {
|
||||
boost = boost170;
|
||||
};
|
||||
percona-xtrabackup_2_4 = callPackage ../tools/backup/percona-xtrabackup/2_4.nix
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost159; };
|
||||
percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost170; };
|
||||
|
||||
pick = callPackage ../tools/misc/pick { };
|
||||
|
||||
|
|
@ -10849,7 +10845,7 @@ with pkgs;
|
|||
|
||||
textadept = callPackage ../applications/editors/textadept/10 { };
|
||||
|
||||
textadept11 = callPackage ../applications/editors/textadept/11 { };
|
||||
textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
|
||||
|
||||
|
|
@ -11041,7 +11037,7 @@ with pkgs;
|
|||
|
||||
traceroute = callPackage ../tools/networking/traceroute { };
|
||||
|
||||
tracebox = callPackage ../tools/networking/tracebox { };
|
||||
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tracee = callPackage ../tools/security/tracee { };
|
||||
|
||||
|
|
@ -11895,7 +11891,7 @@ with pkgs;
|
|||
|
||||
xwinwrap = callPackage ../tools/X11/xwinwrap {};
|
||||
|
||||
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
|
||||
yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
yajsv = callPackage ../tools/misc/yajsv { };
|
||||
|
||||
|
|
@ -12570,6 +12566,8 @@ with pkgs;
|
|||
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
|
||||
gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;
|
||||
|
||||
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv;
|
||||
|
||||
# This is not intended for use in nixpkgs but for providing a faster-running
|
||||
# compiler to nixpkgs users by building gcc with reproducibility-breaking
|
||||
# profile-guided optimizations
|
||||
|
|
@ -13504,9 +13502,8 @@ with pkgs;
|
|||
|
||||
mint = callPackage ../development/compilers/mint { };
|
||||
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
|
||||
};
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme
|
||||
{ stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
enableX11 = true;
|
||||
|
|
@ -13583,9 +13580,8 @@ with pkgs;
|
|||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
obliv-c = callPackage ../development/compilers/obliv-c {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
|
||||
};
|
||||
obliv-c = callPackage ../development/compilers/obliv-c
|
||||
{ stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
|
||||
|
||||
ocaml-ng = callPackage ./ocaml-packages.nix { };
|
||||
ocaml = ocamlPackages.ocaml;
|
||||
|
|
@ -13697,7 +13693,7 @@ with pkgs;
|
|||
|
||||
mrustc = callPackage ../development/compilers/mrustc { };
|
||||
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
|
||||
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
|
||||
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
rustPackages_1_60 = rust_1_60.packages.stable;
|
||||
rustPackages = rustPackages_1_60;
|
||||
|
|
@ -14946,10 +14942,7 @@ with pkgs;
|
|||
buildJdk = jdk11_headless;
|
||||
buildJdkName = "java11";
|
||||
runJdk = jdk11_headless;
|
||||
stdenv =
|
||||
if stdenv.cc.isClang then llvmPackages.stdenv
|
||||
else if stdenv.cc.isGNU then gcc10Stdenv
|
||||
else stdenv;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;
|
||||
bazel_self = bazel_4;
|
||||
};
|
||||
|
||||
|
|
@ -16291,7 +16284,7 @@ with pkgs;
|
|||
|
||||
symfony-cli = callPackage ../development/tools/symfony-cli { };
|
||||
|
||||
swiftshader = callPackage ../development/libraries/swiftshader { };
|
||||
swiftshader = callPackage ../development/libraries/swiftshader { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
systemfd = callPackage ../development/tools/systemfd { };
|
||||
|
||||
|
|
@ -16306,7 +16299,7 @@ with pkgs;
|
|||
|
||||
c3c = callPackage ../development/compilers/c3c { };
|
||||
|
||||
swfmill = callPackage ../tools/video/swfmill { };
|
||||
swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
swftools = callPackage ../tools/video/swftools {
|
||||
stdenv = gccStdenv;
|
||||
|
|
@ -16455,7 +16448,7 @@ with pkgs;
|
|||
|
||||
webdis = callPackage ../development/tools/database/webdis { };
|
||||
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { };
|
||||
xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
|
||||
|
||||
|
|
@ -16852,7 +16845,7 @@ with pkgs;
|
|||
classads = callPackage ../development/libraries/classads { };
|
||||
|
||||
clfft = callPackage ../development/libraries/clfft {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
clipp = callPackage ../development/libraries/clipp { };
|
||||
|
|
@ -16928,7 +16921,7 @@ with pkgs;
|
|||
|
||||
uci = callPackage ../development/libraries/uci { };
|
||||
|
||||
uri = callPackage ../development/libraries/uri { };
|
||||
uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cppcms = callPackage ../development/libraries/cppcms { };
|
||||
|
||||
|
|
@ -16958,7 +16951,7 @@ with pkgs;
|
|||
|
||||
cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
|
||||
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { };
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cwiid = callPackage ../development/libraries/cwiid { };
|
||||
|
||||
|
|
@ -19661,7 +19654,7 @@ with pkgs;
|
|||
|
||||
mosquitto = callPackage ../servers/mqtt/mosquitto { };
|
||||
|
||||
mps = callPackage ../development/libraries/mps { };
|
||||
mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
|
||||
|
||||
|
|
@ -19783,7 +19776,7 @@ with pkgs;
|
|||
|
||||
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
|
||||
|
||||
non = callPackage ../applications/audio/non { };
|
||||
non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
ntl = callPackage ../development/libraries/ntl { };
|
||||
|
||||
|
|
@ -20892,7 +20885,7 @@ with pkgs;
|
|||
|
||||
tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
|
||||
|
||||
tiscamera = callPackage ../os-specific/linux/tiscamera { };
|
||||
tiscamera = callPackage ../os-specific/linux/tiscamera { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tivodecode = callPackage ../applications/video/tivodecode { };
|
||||
|
||||
|
|
@ -21106,7 +21099,7 @@ with pkgs;
|
|||
|
||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
|
||||
webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
|
||||
# bump when majoring of packages have updated
|
||||
webrtc-audio-processing = webrtc-audio-processing_0_3;
|
||||
|
|
@ -21276,7 +21269,7 @@ with pkgs;
|
|||
|
||||
zlib-ng = callPackage ../development/libraries/zlib-ng { };
|
||||
|
||||
libdynd = callPackage ../development/libraries/libdynd { };
|
||||
libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
zlog = callPackage ../development/libraries/zlog { };
|
||||
|
||||
|
|
@ -22270,7 +22263,7 @@ with pkgs;
|
|||
|
||||
nginx-sso = callPackage ../servers/nginx-sso { };
|
||||
|
||||
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
|
||||
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; };
|
||||
percona-server = percona-server56;
|
||||
|
||||
riak = callPackage ../servers/nosql/riak/2.2.0.nix {
|
||||
|
|
@ -22732,7 +22725,7 @@ with pkgs;
|
|||
|
||||
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
|
||||
|
||||
xqilla = callPackage ../development/tools/xqilla { };
|
||||
xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
xquartz = callPackage ../servers/x11/xquartz { };
|
||||
|
||||
|
|
@ -23638,7 +23631,7 @@ with pkgs;
|
|||
|
||||
pipework = callPackage ../os-specific/linux/pipework { };
|
||||
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { };
|
||||
pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
plymouth = callPackage ../os-specific/linux/plymouth { };
|
||||
|
||||
|
|
@ -25894,7 +25887,7 @@ with pkgs;
|
|||
droopy = python3Packages.callPackage ../applications/networking/droopy { };
|
||||
|
||||
drumgizmo = callPackage ../applications/audio/drumgizmo {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
dsf2flac = callPackage ../applications/audio/dsf2flac { };
|
||||
|
|
@ -26216,9 +26209,9 @@ with pkgs;
|
|||
|
||||
flrig = callPackage ../applications/radio/flrig { };
|
||||
|
||||
fluxus = callPackage ../applications/graphics/fluxus { };
|
||||
fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
flwrap = callPackage ../applications/radio/flwrap { };
|
||||
flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
fluidsynth = callPackage ../applications/audio/fluidsynth {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
|
||||
|
|
@ -26910,7 +26903,7 @@ with pkgs;
|
|||
inherit (gnome2) GConf;
|
||||
};
|
||||
|
||||
gosmore = callPackage ../applications/misc/gosmore { };
|
||||
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
|
||||
inherit (darwin) IOKit;
|
||||
|
|
@ -27488,7 +27481,7 @@ with pkgs;
|
|||
|
||||
jgmenu = callPackage ../applications/misc/jgmenu { };
|
||||
|
||||
jigdo = callPackage ../applications/misc/jigdo { };
|
||||
jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
|
||||
|
||||
|
|
@ -28102,7 +28095,7 @@ with pkgs;
|
|||
|
||||
mikmod = callPackage ../applications/audio/mikmod { };
|
||||
|
||||
miniaudicle = callPackage ../applications/audio/miniaudicle { };
|
||||
miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
minicom = callPackage ../tools/misc/minicom { };
|
||||
|
||||
|
|
@ -28948,7 +28941,7 @@ with pkgs;
|
|||
|
||||
pianobar = callPackage ../applications/audio/pianobar { };
|
||||
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
pianoteq = callPackage ../applications/audio/pianoteq { };
|
||||
|
||||
|
|
@ -29697,7 +29690,7 @@ with pkgs;
|
|||
|
||||
socialscan = with python3.pkgs; toPythonApplication socialscan;
|
||||
|
||||
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
|
||||
sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
|
||||
|
||||
|
|
@ -30652,11 +30645,8 @@ with pkgs;
|
|||
wxGTK = wxGTK31;
|
||||
};
|
||||
|
||||
wxcam = callPackage ../applications/video/wxcam {
|
||||
inherit (gnome2) libglade;
|
||||
wxGTK = wxGTK28;
|
||||
gtk = gtk2;
|
||||
};
|
||||
wxcam = callPackage ../applications/video/wxcam
|
||||
{ stdenv = gcc10StdenvCompat; inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; };
|
||||
|
||||
xa = callPackage ../development/compilers/xa/xa.nix { };
|
||||
dxa = callPackage ../development/compilers/xa/dxa.nix { };
|
||||
|
|
@ -31242,17 +31232,15 @@ with pkgs;
|
|||
boost = boost17x;
|
||||
};
|
||||
|
||||
oxen = callPackage ../applications/blockchains/oxen {
|
||||
boost = boost17x;
|
||||
};
|
||||
oxen = callPackage ../applications/blockchains/oxen
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost17x; };
|
||||
|
||||
masari = callPackage ../applications/blockchains/masari { boost = boost165; };
|
||||
|
||||
napari = with python3Packages; toPythonApplication napari;
|
||||
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet {
|
||||
boost = boost172;
|
||||
};
|
||||
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet
|
||||
{ stdenv = gcc10StdenvCompat; boost = boost172; };
|
||||
|
||||
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
|
||||
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
|
||||
|
|
@ -31619,16 +31607,16 @@ with pkgs;
|
|||
cuyo = callPackage ../games/cuyo { };
|
||||
|
||||
deliantra-server = callPackage ../games/deliantra/server.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-arch = callPackage ../games/deliantra/arch.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-maps = callPackage ../games/deliantra/maps.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
deliantra-data = callPackage ../games/deliantra/data.nix {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
ddnet = callPackage ../games/ddnet { };
|
||||
|
|
@ -31651,9 +31639,8 @@ with pkgs;
|
|||
|
||||
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
|
||||
|
||||
dxx-rebirth = callPackage ../games/dxx-rebirth {
|
||||
physfs = physfs_2;
|
||||
};
|
||||
dxx-rebirth = callPackage ../games/dxx-rebirth
|
||||
{ stdenv = gcc10StdenvCompat; physfs = physfs_2; };
|
||||
|
||||
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
|
||||
descent1-assets
|
||||
|
|
@ -31919,7 +31906,7 @@ with pkgs;
|
|||
|
||||
manaplus = callPackage ../games/manaplus { };
|
||||
|
||||
mars = callPackage ../games/mars { };
|
||||
mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
megaglest = callPackage ../games/megaglest { };
|
||||
|
||||
|
|
@ -32018,7 +32005,7 @@ with pkgs;
|
|||
|
||||
openlierox = callPackage ../games/openlierox { };
|
||||
|
||||
openclonk = callPackage ../games/openclonk { };
|
||||
openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
openjk = callPackage ../games/openjk { };
|
||||
|
||||
|
|
@ -32247,10 +32234,8 @@ with pkgs;
|
|||
# You still can override by passing more arguments.
|
||||
space-orbit = callPackage ../games/space-orbit { };
|
||||
|
||||
spring = callPackage ../games/spring {
|
||||
asciidoc = asciidoc-full;
|
||||
boost = boost155;
|
||||
};
|
||||
spring = callPackage ../games/spring
|
||||
{ stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; };
|
||||
|
||||
springLobby = callPackage ../games/spring/springlobby.nix { };
|
||||
|
||||
|
|
@ -32294,12 +32279,8 @@ with pkgs;
|
|||
|
||||
stt = callPackage ../tools/audio/stt { };
|
||||
|
||||
stuntrally = callPackage ../games/stuntrally {
|
||||
ogre = ogre1_9;
|
||||
mygui = mygui.override {
|
||||
withOgre = true;
|
||||
};
|
||||
};
|
||||
stuntrally = callPackage ../games/stuntrally
|
||||
{ stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; };
|
||||
|
||||
superTux = callPackage ../games/supertux { };
|
||||
|
||||
|
|
@ -32749,23 +32730,23 @@ with pkgs;
|
|||
};
|
||||
|
||||
bpp-core = callPackage ../development/libraries/science/biology/bpp-core {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
bppsuite = callPackage ../applications/science/biology/bppsuite {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
cd-hit = callPackage ../applications/science/biology/cd-hit {
|
||||
|
|
@ -32923,7 +32904,7 @@ with pkgs;
|
|||
|
||||
star = callPackage ../applications/science/biology/star { };
|
||||
|
||||
strelka = callPackage ../applications/science/biology/strelka { };
|
||||
strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
inherit (callPackages ../applications/science/biology/sumatools {})
|
||||
sumalibs
|
||||
|
|
@ -32992,7 +32973,7 @@ with pkgs;
|
|||
|
||||
flintqs = callPackage ../development/libraries/science/math/flintqs { };
|
||||
|
||||
getdp = callPackage ../applications/science/math/getdp { };
|
||||
getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
gurobi = callPackage ../applications/science/math/gurobi { };
|
||||
|
||||
|
|
@ -33146,7 +33127,7 @@ with pkgs;
|
|||
|
||||
### SCIENCE/MOLECULAR-DYNAMICS
|
||||
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
|
||||
dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
lammps = callPackage ../applications/science/molecular-dynamics/lammps {
|
||||
fftw = fftw;
|
||||
|
|
@ -33242,7 +33223,7 @@ with pkgs;
|
|||
alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
|
||||
|
||||
aspino = callPackage ../applications/science/logic/aspino {
|
||||
stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
beluga = callPackage ../applications/science/logic/beluga {};
|
||||
|
|
@ -34083,7 +34064,7 @@ with pkgs;
|
|||
|
||||
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
|
||||
|
||||
idsk = callPackage ../tools/filesystems/idsk { };
|
||||
idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
colima = callPackage ../applications/virtualization/colima { };
|
||||
|
||||
|
|
@ -34546,7 +34527,7 @@ with pkgs;
|
|||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
rss-glx = callPackage ../misc/screensavers/rss-glx { };
|
||||
rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
run-scaled = callPackage ../tools/X11/run-scaled { };
|
||||
|
||||
|
|
@ -35189,9 +35170,8 @@ with pkgs;
|
|||
|
||||
openring = callPackage ../applications/misc/openring { };
|
||||
|
||||
openvino = callPackage ../development/libraries/openvino {
|
||||
python = python3;
|
||||
};
|
||||
openvino = callPackage ../development/libraries/openvino
|
||||
{ stdenv = gcc10StdenvCompat; python = python3; };
|
||||
|
||||
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
|
||||
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
|
||||
|
|
|
|||
Loading…
Reference in a new issue