diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-02-05 14:29:47 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-02-06 12:28:50 +0100 |
commit | 576464c74dc02d6ebb286f2a9f4b82d64d451ed1 (patch) | |
tree | fcf458c92c9f4e5a2354a54ace09a521534e2411 /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | 45d5c015a98acdae64f1b6ab6493699cf57326a7 (diff) | |
download | nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar.gz nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar.bz2 nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar.lz nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar.xz nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.tar.zst nixpkgs-576464c74dc02d6ebb286f2a9f4b82d64d451ed1.zip |
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.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d25dd2a7830..d93fc5ceb40 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -19,13 +19,12 @@ , jre8 , pipewire_0_2 , libva +, libdrm, wayland, mesa, libxkbcommon # Ozone # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -143,11 +142,11 @@ let jre pipewire_0_2 libva + libdrm wayland mesa.drivers libxkbcommon ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; + ++ optional pulseSupport libpulseaudio; patches = [ ./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 ({ + is_official_build = true; custom_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_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; @@ -266,15 +265,6 @@ let } // optionalAttrs pulseSupport { use_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") { # 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 |