Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chromiumDev: Fix the build #119320

Merged
merged 1 commit into from
Apr 13, 2021
Merged

chromiumDev: Fix the build #119320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ];
};
})
13 changes: 8 additions & 5 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ++ [
Expand Down Expand Up @@ -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
Expand Down