chromium: Remove our old overrides for VA-API and Ozone
These gn arguments aren't required anymore as they're now equal to the current defaults.
This commit is contained in:
parent
45d5c015a9
commit
576464c74d
|
@ -19,13 +19,12 @@
|
||||||
, jre8
|
, jre8
|
||||||
, pipewire_0_2
|
, pipewire_0_2
|
||||||
, libva
|
, libva
|
||||||
|
, libdrm, wayland, mesa, libxkbcommon # Ozone
|
||||||
|
|
||||||
# optional dependencies
|
# optional dependencies
|
||||||
, libgcrypt ? null # gnomeSupport || cupsSupport
|
, libgcrypt ? null # gnomeSupport || cupsSupport
|
||||||
, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
|
|
||||||
|
|
||||||
# package customization
|
# package customization
|
||||||
, useOzone ? true
|
|
||||||
, gnomeSupport ? false, gnome ? null
|
, gnomeSupport ? false, gnome ? null
|
||||||
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
|
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
|
||||||
, proprietaryCodecs ? true
|
, proprietaryCodecs ? true
|
||||||
|
@ -143,11 +142,11 @@ let
|
||||||
jre
|
jre
|
||||||
pipewire_0_2
|
pipewire_0_2
|
||||||
libva
|
libva
|
||||||
|
libdrm wayland mesa.drivers libxkbcommon
|
||||||
] ++ optional gnomeKeyringSupport libgnome-keyring3
|
] ++ optional gnomeKeyringSupport libgnome-keyring3
|
||||||
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
||||||
++ optionals cupsSupport [ libgcrypt cups ]
|
++ optionals cupsSupport [ libgcrypt cups ]
|
||||||
++ optional pulseSupport libpulseaudio
|
++ optional pulseSupport libpulseaudio;
|
||||||
++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
||||||
|
@ -226,11 +225,11 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
gnFlags = mkGnFlags ({
|
gnFlags = mkGnFlags ({
|
||||||
|
is_official_build = true;
|
||||||
custom_toolchain = "//build/toolchain/linux/unbundle:default";
|
custom_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||||
host_toolchain = "//build/toolchain/linux/unbundle:default";
|
host_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||||
is_official_build = true;
|
system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
|
||||||
|
|
||||||
use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released
|
|
||||||
use_sysroot = false;
|
use_sysroot = false;
|
||||||
use_gnome_keyring = gnomeKeyringSupport;
|
use_gnome_keyring = gnomeKeyringSupport;
|
||||||
use_gio = gnomeSupport;
|
use_gio = gnomeSupport;
|
||||||
|
@ -266,15 +265,6 @@ let
|
||||||
} // optionalAttrs pulseSupport {
|
} // optionalAttrs pulseSupport {
|
||||||
use_pulseaudio = true;
|
use_pulseaudio = true;
|
||||||
link_pulseaudio = true;
|
link_pulseaudio = true;
|
||||||
} // optionalAttrs useOzone {
|
|
||||||
use_ozone = true;
|
|
||||||
use_xkbcommon = true;
|
|
||||||
use_glib = true;
|
|
||||||
use_gtk = true;
|
|
||||||
use_system_libwayland = true;
|
|
||||||
use_system_minigbm = true;
|
|
||||||
use_system_libdrm = true;
|
|
||||||
system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
|
|
||||||
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
||||||
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
||||||
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
||||||
|
|
Loading…
Reference in a new issue