diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-24 00:16:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-24 00:16:17 +0000 |
| commit | 6e7c70d02d4f24dd840fd24a812895205c3a2f9b (patch) | |
| tree | ffbed9ee289a0ad29b6e4bacd2d42043e70e1942 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 0d0e7ca7695a2d45cd53169d3a6ae423edf46b80 (diff) | |
| parent | c298ef8855f6ad629da5e09aab36ee673473316c (diff) | |
| download | nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.gz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.bz2 nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.lz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.xz nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.tar.zst nixpkgs-6e7c70d02d4f24dd840fd24a812895205c3a2f9b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6a83dcd91c8..31e7d4b2fdd 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 @@ -42,6 +42,16 @@ with lib; let 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 # source tree. @@ -127,9 +137,9 @@ let nativeBuildInputs = [ llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkg-config - python2Packages.ply python2Packages.jinja2 nodejs - gnutar python2Packages.setuptools + ninja which pythonPackages.python perl pkg-config + pythonPackages.ply pythonPackages.jinja2 nodejs + gnutar pythonPackages.setuptools ]; buildInputs = defaultDependencies ++ [ @@ -169,6 +179,8 @@ let postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' # Required for patchShebangs (unsupported): chmod -x third_party/webgpu-cts/src/tools/deno + '' + optionalString (chromiumVersionAtLeast "92") '' + patch -p1 --reverse < ${forcePython3Patch} '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do |