Skip to content

Commit

Permalink
gcc: switch default to gcc9
Browse files Browse the repository at this point in the history
  • Loading branch information
globin authored and fpletz committed Nov 2, 2019
1 parent 83a5ad1 commit 8f729c0
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3125,9 +3125,7 @@ in

fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };

fcppt = callPackage ../development/libraries/fcppt {
stdenv = gcc8Stdenv;
};
fcppt = callPackage ../development/libraries/fcppt { };

fcrackzip = callPackage ../tools/security/fcrackzip { };

Expand Down Expand Up @@ -3158,7 +3156,6 @@ in
flatpak-builder = callPackage ../development/tools/flatpak-builder { };

fltrdr = callPackage ../tools/misc/fltrdr {
stdenv = gcc8Stdenv;
icu = icu63;
};

Expand Down Expand Up @@ -7663,8 +7660,8 @@ in
gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; };
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };

gccFun = callPackage ../development/compilers/gcc/8;
gcc = gcc8;
gccFun = callPackage ../development/compilers/gcc/9;
gcc = gcc9;
gcc-unwrapped = gcc.cc;

gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
Expand Down

0 comments on commit 8f729c0

Please sign in to comment.