diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-02-15 17:49:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-15 17:49:01 -0500 |
| commit | f8eef26991c3a6660e4343ab42253056826932a8 (patch) | |
| tree | 0d066edaafd70e729bd898d17c75196cd6ce124b /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | 2e359d93ef5cffbafa7626c20161cb355844d514 (diff) | |
| parent | e29565110886f9857e48376191f9fbd8e43e2a6d (diff) | |
| download | nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar.gz nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar.bz2 nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar.lz nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar.xz nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.tar.zst nixpkgs-f8eef26991c3a6660e4343ab42253056826932a8.zip | |
Merge pull request #55732 from oxij/tree/move-defaults-to-package-files-mostly-pulse
all-packages.nix: move defaults to package files continues
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -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 = { |