cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #141027 from primeos/chromium-py3

Browse source 
chromium: Drop Python 2
This commit is contained in:
Michael Weiss 2021-10-15 23:05:20 +02:00 committed by GitHub
commit a2c8880f46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -6,7 +6,7 @@
# Native build inputs: # Native build inputs:
, ninja, pkg-config , ninja, pkg-config
, python2, python3, perl , python3, perl
, gnutar, which , gnutar, which
, llvmPackages , llvmPackages
# postPatch: # postPatch:
@ -56,6 +56,10 @@ let
python3WithPackages = python3.withPackages(ps: with ps; [ python3WithPackages = python3.withPackages(ps: with ps; [
ply jinja2 setuptools ply jinja2 setuptools
]); ]);
clangFormatPython3 = fetchurl {
url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT";
sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l";
};
# The additional attributes for creating derivations based on the chromium # The additional attributes for creating derivations based on the chromium
# source tree. # source tree.
@ -122,7 +126,7 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
ninja pkg-config ninja pkg-config
python2 python3WithPackages perl python3WithPackages perl
gnutar which gnutar which
llvmPackages.bintools llvmPackages.bintools
]; ];
@ -209,6 +213,9 @@ let
# Allow to put extensions into the system-path. # Allow to put extensions into the system-path.
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
# We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408:
base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format
patchShebangs . patchShebangs .
# Link to our own Node.js and Java (required during the build): # 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