chromium: Drop our closure_compiler patch for Java
Hopefully the Java dependency can be dropped soon: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875#c5
This commit is contained in:
parent
029fbe8219
commit
8505750ac8
@ -42,7 +42,6 @@ buildFun:
|
|||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
|
||||||
python2WithPackages = python2.withPackages(ps: with ps; [
|
python2WithPackages = python2.withPackages(ps: with ps; [
|
||||||
ply jinja2 setuptools
|
ply jinja2 setuptools
|
||||||
]);
|
]);
|
||||||
@ -152,7 +151,6 @@ let
|
|||||||
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
||||||
mesa # required for libgbm
|
mesa # required for libgbm
|
||||||
pciutils protobuf speechd libXdamage at-spi2-core
|
pciutils protobuf speechd libXdamage at-spi2-core
|
||||||
jre
|
|
||||||
pipewire
|
pipewire
|
||||||
libva
|
libva
|
||||||
libdrm wayland mesa.drivers libxkbcommon
|
libdrm wayland mesa.drivers libxkbcommon
|
||||||
@ -167,7 +165,6 @@ let
|
|||||||
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
||||||
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
|
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
|
||||||
./patches/fix-missing-atspi2-dependency.patch
|
./patches/fix-missing-atspi2-dependency.patch
|
||||||
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
|
||||||
] ++ lib.optionals (versionRange "91" "94.0.4583.0") [
|
] ++ lib.optionals (versionRange "91" "94.0.4583.0") [
|
||||||
# Required as dependency for the next patch:
|
# Required as dependency for the next patch:
|
||||||
(githubPatch {
|
(githubPatch {
|
||||||
@ -242,9 +239,10 @@ let
|
|||||||
sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
|
sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
|
||||||
|
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
# use our own nodejs
|
# Link to our own Node.js and Java (required during the build):
|
||||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||||
ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
|
ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node
|
||||||
|
ln -s "${jre8}/bin/java" third_party/jdk/current/bin/
|
||||||
|
|
||||||
# Allow building against system libraries in official builds
|
# Allow building against system libraries in official builds
|
||||||
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
|
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Weiss <dev.primeos@gmail.com>
|
|
||||||
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
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user