diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:31:25 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-13 23:11:29 +0000 |
| commit | f91e811e44ccfdfd8190dd192145baa5670960ac (patch) | |
| tree | c5eb99d1a589c7463263f926076606a8c4ad7ac7 /pkgs/applications | |
| parent | fe7537945909ad051ad1ae532a656f49fd9b4301 (diff) | |
| download | nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar.gz nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar.bz2 nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar.lz nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar.xz nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.tar.zst nixpkgs-f91e811e44ccfdfd8190dd192145baa5670960ac.zip | |
chromium: move defaults to package file
This one is a bit untrivial.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 88b0a89db4b..c7917e923d4 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 = { |