diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-13 10:17:35 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-04-13 13:30:54 +0200 |
| commit | acf402b0c086fff4eb2cbbeadce34b229d0dec0e (patch) | |
| tree | c31f2b647b7d78d14ddd1df74dfa3e59b3bb9360 | |
| parent | 262c722ee71b65a7417488367e70fb11d06caaf4 (diff) | |
| download | nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar.gz nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar.bz2 nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar.lz nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar.xz nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.tar.zst nixpkgs-acf402b0c086fff4eb2cbbeadce34b229d0dec0e.zip | |
chromiumDev: Fix the build
Mixing Python 2 and Python 3 causes issues with the Python dependencies.
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index f37666b0033..c4a5508b753 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -89,6 +89,5 @@ mkChromiumDerivation (base: rec { then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = elem channel [ "dev" ]; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 65b620cd81d..1c3da1c8607 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, python3Packages, perl, pkg-config +, python2Packages, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -130,8 +130,6 @@ let ninja which python2Packages.python perl pkg-config python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools - ] ++ optionals (chromiumVersionAtLeast "91") [ - python3Packages.python ]; buildInputs = defaultDependencies ++ [ @@ -163,9 +161,14 @@ let sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny"; }) ++ optional (chromiumVersionAtLeast "90") ./patches/fix-missing-atspi2-dependency.patch - ++ optional (chromiumVersionAtLeast "91") + ++ optionals (chromiumVersionAtLeast "91") [ ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch - ; + (githubPatch + # Revert "Reland #7 of "Force Python 3 to be used in build."" + "38b6a9a8e5901766613879b6976f207aa163588a" + "1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9" + ) + ]; postPatch = '' # remove unused third-party |