diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-01-28 22:06:23 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-01-28 22:32:32 +0100 |
| commit | 241db3bb01463ec0e584630bb426cb5f8b18316f (patch) | |
| tree | 67c003a6d9d65fca9adafe5645576a900c100206 /pkgs/applications/networking | |
| parent | d226cb45416ed624d48bf96c63d3b01166248d19 (diff) | |
chromium{Beta,Dev}: Disable PGO to "fix" a build error
This also fixes/improves versionRange because the ungoogled-chromium
version will lag behind the Chromium version.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2b7cdb9b4b7c..acf1e6a7ee67 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -101,12 +101,14 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + chromiumVersionAtLeast = min-version: + versionAtLeast upstream-info.version min-version; versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + ungoogled-version = (importJSON ./upstream-info.json).ungoogled.version; + in if versionAtLeast ungoogled-version upto-version + then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result else result; @@ -269,6 +271,10 @@ let 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 + chrome_pgo_phase = 0; } // optionalAttrs ungoogled { chrome_pgo_phase = 0; enable_hangout_services_extension = false; |