public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromiumDev: Fix the configuration phase (#120464)

Browse Source 
The Python 3 support still isn't ready...
This commit is contained in:
Michael Weiss 2021-04-23 23:24:13 +02:00 committed by GitHub
parent 6599c900aa
commit 0dee033ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp , xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2 , libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config , python2Packages, python3Packages, perl, pkg-config
, nspr, systemd, libkrb5 , nspr, systemd, libkrb5
, util-linux, alsaLib , util-linux, alsaLib
, bison, gperf , bison, gperf
@ -42,6 +42,16 @@ with lib;
let let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
# currently doesn't work due to mixed Python 2/3 dependencies:
pythonPackages = if chromiumVersionAtLeast "93"
then python3Packages
else python2Packages;
forcePython3Patch = (githubPatch
# Reland #8 of "Force Python 3 to be used in build."":
"a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
"1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
);
# The additional attributes for creating derivations based on the chromium # The additional attributes for creating derivations based on the chromium
# source tree. # source tree.
@ -127,9 +137,9 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
llvmPackages.lldClang.bintools llvmPackages.lldClang.bintools
ninja which python2Packages.python perl pkg-config ninja which pythonPackages.python perl pkg-config
python2Packages.ply python2Packages.jinja2 nodejs pythonPackages.ply pythonPackages.jinja2 nodejs
gnutar python2Packages.setuptools gnutar pythonPackages.setuptools
]; ];
buildInputs = defaultDependencies ++ [ buildInputs = defaultDependencies ++ [
@ -168,6 +178,8 @@ let
postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
# Required for patchShebangs (unsupported): # Required for patchShebangs (unsupported):
chmod -x third_party/webgpu-cts/src/tools/deno chmod -x third_party/webgpu-cts/src/tools/deno
'' + optionalString (chromiumVersionAtLeast "92") ''
patch -p1 --reverse < ${forcePython3Patch}
'' + '' '' + ''
# remove unused third-party # remove unused third-party
for lib in ${toString gnSystemLibraries}; do for lib in ${toString gnSystemLibraries}; do