diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-28 17:07:19 +0100 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-28 17:10:53 +0100 |
commit | ed91407784dce5a5ebe7518fcc51581207f8027f (patch) | |
tree | 82df779f60373d1039257ef5035b2850070fc98c /pkgs/top-level/all-packages.nix | |
parent | 48127c9c7b1fb1b11f2da365a68d2ff08e61547e (diff) | |
download | nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar.gz nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar.bz2 nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar.lz nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar.xz nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.tar.zst nixlib-ed91407784dce5a5ebe7518fcc51581207f8027f.zip |
Revert "chromium: make gcc8 build available via buildWithGcc flag"
This partially reverts commit b70ab5c405f3c3b1852286696130f0112b80979b (except for depending gnome2) see #48922
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33f30c2126c8..9dc5b7548af0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16021,8 +16021,13 @@ with pkgs; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - buildWithGcc = config.chromium.buildWithGcc or stdenv.isAarch64; - }); + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; |