cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

chromium: move defaults to package file

Browse source 
This one is a bit untrivial.
This commit is contained in:
Jan Malakhovski 2019-02-03 15:31:25 +00:00
parent fe75379459
commit f91e811e44
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,4 +1,5 @@
{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
# package customization
@ -10,12 +11,17 @@
, enablePepperFlash ? false
, enableWideVine ? false
, cupsSupport ? true
, pulseSupport ? false
, pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? ""
}:
assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
let
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
in let
stdenv = stdenv_;
llvmPackages = llvmPackages_;
callPackage = newScope chromium;
chromium = {

13
pkgs/top-level/all-packages.nix
View file

@ -16295,18 +16295,7 @@ in
bookworm = callPackage ../applications/office/bookworm { };
chromium = callPackage ../applications/networking/browsers/chromium ({
channel = "stable";
pulseSupport = config.pulseaudio or true;
enablePepperFlash = config.chromium.enablePepperFlash or false;
enableWideVine = config.chromium.enableWideVine or false;
} // (if stdenv.isAarch64 then {
stdenv = gcc8Stdenv;
} else {
llvmPackages = llvmPackages_7;
stdenv = llvmPackages_7.stdenv;
})
);
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
chronos = callPackage ../applications/networking/cluster/chronos { };