mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

chromium{Beta,Dev}: Fix the builds

Browse source 
Fix #89615.
This commit is contained in:
Michael Weiss 2020-06-08 13:54:31 +02:00
parent 496bc90c6c
commit e466ea721c
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -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
@ -123,7 +124,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
@ -224,6 +226,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") {