alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

chromiumDev: Fix the build

Browse source 
Note: I've only tested this with llvmPackages_git but it should work
with llvmPackages_13 as well.

fieldtrial_testing_like_official_build was renamed to
disable_fieldtrial_testing_config:
486e9d58c0
This commit is contained in:
Michael Weiss 2021-08-04 11:14:45 +02:00
parent 9bc2d82b55
commit 1e372f4004
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -267,7 +267,6 @@ let
clang_use_chrome_plugins = false; clang_use_chrome_plugins = false;
blink_symbol_level = 0; blink_symbol_level = 0;
symbol_level = 0; symbol_level = 0;
fieldtrial_testing_like_official_build = true;
# Google API key, see: https://www.chromium.org/developers/how-tos/api-keys # Google API key, see: https://www.chromium.org/developers/how-tos/api-keys
# Note: The API key is for NixOS/nixpkgs use ONLY. # Note: The API key is for NixOS/nixpkgs use ONLY.
@ -288,6 +287,10 @@ let
enable_widevine = true; enable_widevine = true;
# Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture:
rtc_use_pipewire = true; rtc_use_pipewire = true;
} // optionalAttrs (!chromiumVersionAtLeast "94") {
fieldtrial_testing_like_official_build = true;
} // optionalAttrs (chromiumVersionAtLeast "94") {
disable_fieldtrial_testing_config = true;
} // optionalAttrs proprietaryCodecs { } // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec # enable support for the H.264 codec
proprietary_codecs = true; proprietary_codecs = true;

10
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper { newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils , llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland , libva, pipewire, wayland
, gcc, nspr, nss, runCommand , gcc, nspr, nss, runCommand
@ -19,7 +19,7 @@
}: }:
let let
llvmPackages = llvmPackages_11; llvmPackages = llvmPackages_12;
stdenv = llvmPackages.stdenv; stdenv = llvmPackages.stdenv;
callPackage = newScope chromium; callPackage = newScope chromium;
@ -38,9 +38,9 @@ let
inherit (upstream-info.deps.gn) url rev sha256; inherit (upstream-info.deps.gn) url rev sha256;
}; };
}); });
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") { } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec {
llvmPackages = llvmPackages_12; llvmPackages = llvmPackages_13;
stdenv = llvmPackages_12.stdenv; stdenv = llvmPackages.stdenv;
}); });
browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };