Skip to content

Commit

Permalink
chromium{Beta,Dev}: Fix the builds
Browse files Browse the repository at this point in the history
Fix #89615.

(cherry picked from commit e466ea7)
  • Loading branch information
primeos committed Jun 10, 2020
1 parent 48f3b97 commit e0c7e1f
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
, xorg
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
Expand Down Expand Up @@ -117,7 +118,8 @@ let
ninja which python2Packages.python perl pkgconfig
python2Packages.ply python2Packages.jinja2 nodejs
gnutar
] ++ optional (versionAtLeast version "83") python2Packages.setuptools;
] ++ optional (versionAtLeast version "83") python2Packages.setuptools
++ optional (versionAtLeast version "84") (xorg.xcbproto.override { python = python2Packages.python; });

buildInputs = defaultDependencies ++ [
nspr nss systemd
Expand Down Expand Up @@ -217,6 +219,11 @@ let
ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang
ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
'' + optionalString (versionAtLeast version "84") ''
substituteInPlace ui/gfx/x/BUILD.gn \
--replace \
'/usr/share/xcb' \
'${xorg.xcbproto}/share/xcb/'
'';

gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
Expand Down

0 comments on commit e0c7e1f

Please sign in to comment.