ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 17:49:58 +03:00
Code Issues Projects Releases Wiki Activity

Revert "chromium: make gcc8 build available via buildWithGcc flag"

Browse Source 
This partially reverts commit
b70ab5c405 (except for depending gnome2)

see #48922
This commit is contained in:
Herwig Hochleitner 2018-10-28 17:07:19 +01:00
parent 48127c9c7b
commit ed91407784
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -31,13 +31,12 @@
, upstream-info , upstream-info
}: }:
assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
buildFun: buildFun:
with stdenv.lib; with stdenv.lib;
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
let let
# The additional attributes for creating derivations based on the chromium # The additional attributes for creating derivations based on the chromium
# source tree. # source tree.

13
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,6 +1,5 @@
{ newScope, makeWrapper, makeDesktopItem, ed { newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas , glib, gtk3, gnome3, gsettings-desktop-schemas
, stdenv, llvmPackages_7, gcc8Stdenv
# package customization # package customization
, channel ? "stable" , channel ? "stable"
@ -10,16 +9,17 @@
, proprietaryCodecs ? true , proprietaryCodecs ? true
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
, buildWithGcc ? false
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? false , pulseSupport ? false
, commandLineArgs ? "" , commandLineArgs ? ""
}: }:
assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
let let
callPackage = newScope chromium; callPackage = newScope chromium;
chromium = { chromium = {
inherit stdenv llvmPackages;
upstream-info = (callPackage ./update.nix {}).getChannel channel; upstream-info = (callPackage ./update.nix {}).getChannel channel;
@ -34,12 +34,7 @@ let
plugins = callPackage ./plugins.nix { plugins = callPackage ./plugins.nix {
inherit enablePepperFlash enableWideVine; inherit enablePepperFlash enableWideVine;
}; };
} // (if buildWithGcc then { };
stdenv = gcc8Stdenv;
} else {
llvmPackages = llvmPackages_7;
stdenv = llvmPackages_7.stdenv;
});
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "chromium-browser"; name = "chromium-browser";

9
pkgs/top-level/all-packages.nix
View File

@ -16021,8 +16021,13 @@ with pkgs;
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
enablePepperFlash = config.chromium.enablePepperFlash or false; enablePepperFlash = config.chromium.enablePepperFlash or false;
enableWideVine = config.chromium.enableWideVine 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 { }; chronos = callPackage ../applications/networking/cluster/chronos { };