BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #141293 from primeos/chromium

Browse source 
chromium: Start dropping Python 2
This commit is contained in:
Michael Weiss 2021-10-13 20:42:57 +02:00 committed by GitHub
commit 18da17118e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,9 +53,6 @@ buildFun:
with lib;
let
python2WithPackages = python2.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
python3WithPackages = python3.withPackages(ps: with ps; [
ply jinja2 setuptools
]);
@ -125,7 +122,7 @@ let
nativeBuildInputs = [
ninja pkg-config
python2WithPackages python3WithPackages perl
python2 python3WithPackages perl
gnutar which
llvmPackages.bintools
];
@ -308,7 +305,7 @@ let
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
# Fail if `gn gen` contains a WARNING.