@@ -19,13 +19,12 @@
1919, jre8
2020, pipewire_0_2
2121, libva
22+, libdrm, wayland, mesa, libxkbcommon # Ozone
2223
2324# optional dependencies
2425, libgcrypt ? null # gnomeSupport || cupsSupport
25−, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
2626
2727# package customization
28−, useOzone ? true
2928, gnomeSupport ? false, gnome ? null
3029, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
3130, proprietaryCodecs ? true
@@ -143,11 +142,11 @@ let
143142 jre
144143 pipewire_0_2
145144 libva
145+ libdrm wayland mesa.drivers libxkbcommon
146146 ] ++ optional gnomeKeyringSupport libgnome-keyring3
147147 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
148148 ++ optionals cupsSupport [ libgcrypt cups ]
149− ++ optional pulseSupport libpulseaudio
150− ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
149+ ++ optional pulseSupport libpulseaudio;
151150
152151 patches = [
153152 ./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
226225 '';
227226
228227 gnFlags = mkGnFlags ({
228+ is_official_build = true;
229229 custom_toolchain = "//build/toolchain/linux/unbundle:default";
230230 host_toolchain = "//build/toolchain/linux/unbundle:default";
231− is_official_build = true;
231+ system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
232232
233− use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released
234233 use_sysroot = false;
235234 use_gnome_keyring = gnomeKeyringSupport;
236235 use_gio = gnomeSupport;
@@ -266,15 +265,6 @@ let
266265 } // optionalAttrs pulseSupport {
267266 use_pulseaudio = true;
268267 link_pulseaudio = true;
269− } // optionalAttrs useOzone {
270− use_ozone = true;
271− use_xkbcommon = true;
272− use_glib = true;
273− use_gtk = true;
274− use_system_libwayland = true;
275− use_system_minigbm = true;
276− use_system_libdrm = true;
277− system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
278268 } // optionalAttrs (chromiumVersionAtLeast "89") {
279269 # Disable PGO (defaults to 2 since M89) because it fails without additional changes:
280270 # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version