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/applications/networking | |
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/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 13 |
2 files changed, 5 insertions, 11 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"; |