aboutsummaryrefslogtreecommitdiff
path: root/pkgs/applications/networking/browsers/chromium
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-09-10 12:04:49 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-09-10 12:31:00 +0200
commite249baca2294cb1644535f1b6b05bca54593256c (patch)
treeeb9b870ad0c9501f95789533e83b5687f853d2da /pkgs/applications/networking/browsers/chromium
parenta9c78519d61e6e26246f7e2c616681a8d04f2ed1 (diff)
chromiumDev: M86 -> M87
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix11
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json12
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1c811acd2547..7f5378e2b199 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -55,6 +55,17 @@ let
sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q";
};
});
+ } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") {
+ llvmPackages = llvmPackages_11;
+ useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/
+ gnChromium = gn.overrideAttrs (oldAttrs: {
+ version = "2020-08-17";
+ src = fetchgit {
+ url = "https://gn.googlesource.com/gn";
+ rev = "6f13aaac55a977e1948910942675c69f2b4f7a94";
+ sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251";
+ };
+ });
});
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 76c384114a9e..dae7f741b357 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -5,13 +5,13 @@
"sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm"
},
"beta": {
- "version": "86.0.4240.22",
- "sha256": "1qxacdwknrjwfp44mnqmq24n8sw4yaf0d1qnz39km2m4apc39svp",
- "sha256bin64": "05qdzkq9daqjliqj7zxsa03903rv3kwaj627192ls6m33bacz9gp"
+ "version": "86.0.4240.30",
+ "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl",
+ "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa"
},
"dev": {
- "version": "86.0.4240.8",
- "sha256": "1x0kbc7xp6599jyn461mbmchbixivnxm0jsyfq0snhxz8x81z55q",
- "sha256bin64": "0y7drzxxfn0vmfq0m426l8xvkgyajb8pjydi0d7kzk6i92sjf45j"
+ "version": "87.0.4252.0",
+ "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y",
+ "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw"
}
}