From 8c60448e2656280a769db8195be9537fdf07f085 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 11 Apr 2021 18:08:56 +0200 Subject: [PATCH 1/2] chromiumDev: Fix two build errors Python 3 is now required (hard-coded in some scripts, but other scripts still require Python 2) and a patch is required for [0]. [0]: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875 --- .../networking/browsers/chromium/common.nix | 8 +++-- ...-Use-the-Java-binary-from-the-system.patch | 31 +++++++++++++++++++ .../fix-missing-atspi2-dependency.patch | 0 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch rename pkgs/applications/networking/browsers/chromium/{ => patches}/fix-missing-atspi2-dependency.patch (100%) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 07634c337af4..65b620cd81d7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, perl, pkg-config +, python2Packages, python3Packages, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -130,6 +130,8 @@ let ninja which python2Packages.python perl pkg-config python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools + ] ++ optionals (chromiumVersionAtLeast "91") [ + python3Packages.python ]; buildInputs = defaultDependencies ++ [ @@ -160,7 +162,9 @@ let url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch"; sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny"; }) ++ optional (chromiumVersionAtLeast "90") - ./fix-missing-atspi2-dependency.patch + ./patches/fix-missing-atspi2-dependency.patch + ++ optional (chromiumVersionAtLeast "91") + ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch b/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch new file mode 100644 index 000000000000..f6b10b679c7a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch @@ -0,0 +1,31 @@ +From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Sun, 11 Apr 2021 18:05:12 +0200 +Subject: [PATCH] closure_compiler: Use the Java binary from the system + +The bundled Java binary (third_party/jdk/current/bin/java) is missing in +the tarball and we want to use the one from the system anyway. +This reverts part of [0]. + +[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794 +--- + third_party/closure_compiler/compiler.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py +index 75690ceb9749..7b9c76f74290 100755 +--- a/third_party/closure_compiler/compiler.py ++++ b/third_party/closure_compiler/compiler.py +@@ -13,8 +13,7 @@ import subprocess + + + _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) +-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") +-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" ++_JAVA_PATH = "java" + + class Compiler(object): + """Runs the Closure compiler on given source files to typecheck them +-- +2.20.1 + diff --git a/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch rename to pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch From fc586861eea6599bfd6b148a2dc59827261c803c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 13 Apr 2021 10:18:06 +0200 Subject: [PATCH 2/2] chromiumBeta: 90.0.4430.61 -> 90.0.4430.70 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f8a823b5f388..f79f0afaf51a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.61", - "sha256": "01vssy3q64pv9rw4cdxv5rdg7yrxmhyc03a5r75fhxc95fj66iac", - "sha256bin64": "07l8dzyv0hav1gls3xw91q9ay2l8xxmsf7yagg940cya9ncl0lhi", + "version": "90.0.4430.70", + "sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym", + "sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws", "deps": { "gn": { "version": "2021-02-09",