diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-27 20:23:12 +0200 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-28 16:00:46 +0100 |
commit | b70ab5c405f3c3b1852286696130f0112b80979b (patch) | |
tree | 63dacef7bb741cf5b96c65442396abbffb128af8 /pkgs/applications/networking | |
parent | 7eea24db5d64229b2372906391b5239a877c89ee (diff) | |
download | nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar.gz nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar.bz2 nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar.lz nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar.xz nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.tar.zst nixlib-b70ab5c405f3c3b1852286696130f0112b80979b.zip |
chromium: make gcc8 build available via buildWithGcc flag
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, 11 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a011d0a892e9..58459934de2f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -31,12 +31,13 @@ , 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 88b0a89db4b1..dbf5f4cb3994 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,6 @@ -{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed +{ newScope, makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas +, stdenv, llvmPackages_7, gcc8Stdenv # package customization , channel ? "stable" @@ -9,17 +10,16 @@ , 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,7 +34,12 @@ 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"; |