diff options
author | Ivan Kozik <ivan@ludios.org> | 2019-10-10 20:32:11 +0000 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-10-11 22:32:18 +0200 |
commit | f45798e544c6fc7dc9fe5494330d98406687fa85 (patch) | |
tree | b750c9e608bc6e1930bd2b35351df11cb9192eeb /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | ccc06a7e01bfd9a59a56c2303202bf48e6385f17 (diff) | |
download | nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar.gz nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar.bz2 nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar.lz nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar.xz nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.tar.zst nixlib-f45798e544c6fc7dc9fe5494330d98406687fa85.zip |
chromium: 77.0.3865.90 -> 77.0.3865.120
CVE-2019-13693 CVE-2019-13694 CVE-2019-13695 CVE-2019-13696 CVE-2019-13697 Disable jumbo mode because upstream dropped support for it. (See chromium-dev "We're removing support for the jumbo build") This makes builds take about 3x as long, but we have no alternative.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4353d2958f58..8caf159fe664 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,18 +96,9 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - versionRange = min-version: upto-version: - let inherit (upstream-info) version; - result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (import ./upstream-info.nix).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." - result - else result; - base = rec { name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) version; + inherit (upstream-info) channel version; inherit packageName buildType buildPath; src = upstream-info.main; @@ -125,19 +116,22 @@ let glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage at-spi2-core + jdk.jre ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional useVaapi libva - ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "72") jdk.jre; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch - ./patches/jumbo-sorted.patch ./patches/no-build-timestamps.patch + ] ++ optionals (channel == "stable" || channel == "beta") [ ./patches/widevine.patch + ] ++ optionals (channel == "dev") [ + ./patches/widevine-79.patch + ] ++ optionals (channel == "stable") [ # Revert "Implement GetFallbackFont on Linux" to fix a performance regression # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed (fetchpatch { @@ -153,7 +147,7 @@ let # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] ] ++ optionals (useVaapi) [ # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi ./patches/chromium-vaapi.patch @@ -234,9 +228,6 @@ let use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; - # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken: - # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9 - use_jumbo_build = (version != "78.0.3904.17"); proprietary_codecs = false; use_sysroot = false; |