From 101abfd618157ee2f91b9d994e34f670941f29c0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Oct 2021 23:13:09 +0200 Subject: [PATCH] chromium: Start dropping Python 2 (cherry picked from commit 7e6d80740d01dd42f1684cbb64d0f236e69dd3c8) --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4b7fbc38bbc..e269d6313ae 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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.