diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-11-27 13:49:04 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-11-27 23:03:48 +0100 |
| commit | 063b3699083c9d83ae97770b2fae9800d172d749 (patch) | |
| tree | e8416fdb0951abb7efd529b9f6a5f981e5e5e36f /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | ab61f1622b617fc4b418341dbfffd143c9dd8605 (diff) | |
| download | nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar.gz nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar.bz2 nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar.lz nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar.xz nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.tar.zst nixpkgs-063b3699083c9d83ae97770b2fae9800d172d749.zip | |
chromium: Cleanup useOzone and useVaapi
But since Ozone is still experimental I'll keep useOzone in common.nix for some time.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 204931dca5b..5d6bb3e408f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -18,20 +18,14 @@ , ffmpeg, libxslt, libxml2, at-spi2-core , jre8 , pipewire_0_2 +, libva # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libva ? null # useVaapi , libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? false -, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper -# VA-API TODOs: -# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" -# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) -# or build with minigbm -# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) +, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -141,8 +135,8 @@ let pciutils protobuf speechd libXdamage at-spi2-core jre pipewire_0_2 - ] ++ optional useVaapi libva - ++ optional gnomeKeyringSupport libgnome-keyring3 + libva + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio @@ -256,8 +250,6 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs useVaapi { - use_vaapi = true; } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; |