From ed91407784dce5a5ebe7518fcc51581207f8027f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 28 Oct 2018 17:07:19 +0100
Subject: [PATCH] Revert "chromium: make gcc8 build available via buildWithGcc
 flag"

This partially reverts commit
b70ab5c405f3c3b1852286696130f0112b80979b (except for depending gnome2)

see #48922
---
 .../networking/browsers/chromium/common.nix         |  3 +--
 .../networking/browsers/chromium/default.nix        | 13 ++++---------
 pkgs/top-level/all-packages.nix                     |  9 +++++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 58459934de2f..a011d0a892e9 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -31,13 +31,12 @@
 , upstream-info
 }:
 
-assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
-
 buildFun:
 
 with stdenv.lib;
 
 # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
+
 let
   # The additional attributes for creating derivations based on the chromium
   # source tree.
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index dbf5f4cb3994..88b0a89db4b1 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,6 +1,5 @@
-{ newScope, makeWrapper, makeDesktopItem, ed
+{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
-, stdenv, llvmPackages_7, gcc8Stdenv
 
 # package customization
 , channel ? "stable"
@@ -10,16 +9,17 @@
 , proprietaryCodecs ? true
 , enablePepperFlash ? false
 , enableWideVine ? false
-, buildWithGcc ? false
 , cupsSupport ? true
 , pulseSupport ? false
 , commandLineArgs ? ""
 }:
 
+assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
 let
   callPackage = newScope chromium;
 
   chromium = {
+    inherit stdenv llvmPackages;
 
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
@@ -34,12 +34,7 @@ let
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enableWideVine;
     };
-  } // (if buildWithGcc then {
-          stdenv = gcc8Stdenv;
-        } else {
-          llvmPackages = llvmPackages_7;
-          stdenv = llvmPackages_7.stdenv;
-        });
+  };
 
   desktopItem = makeDesktopItem {
     name = "chromium-browser";
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 { };