mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
Revert "chromium: make gcc8 build available via buildWithGcc flag"
This partially reverts commit
b70ab5c405
(except for depending gnome2)
see #48922
This commit is contained in:
parent
48127c9c7b
commit
ed91407784
@ -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.
|
||||
|
@ -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";
|
||||
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user