@@ -13,7 +13,6 @@
1313, bison, gperf
1414, glib, gtk3, dbus-glib
1515, glibc
16−, xorg
1716, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
1817, protobuf, speechd, libXdamage, cups
1918, ffmpeg_3, libxslt, libxml2, at-spi2-core
@@ -131,7 +130,6 @@ let
131130 ninja which python2Packages.python perl pkgconfig
132131 python2Packages.ply python2Packages.jinja2 nodejs
133132 gnutar python2Packages.setuptools
134− (xorg.xcbproto.override { python = python2Packages.python; })
135133 ];
136134
137135 buildInputs = defaultDependencies ++ [
@@ -150,9 +148,7 @@ let
150148 ++ optional pulseSupport libpulseaudio
151149 ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
152150
153− patches = optionals (versionRange "68" "86") [
154− ./patches/nix_plugin_paths_68.patch
155− ] ++ [
151+ patches = [
156152 ./patches/remove-webp-include-69.patch
157153 ./patches/no-build-timestamps.patch
158154 ./patches/widevine-79.patch
@@ -166,18 +162,19 @@ let
166162 #
167163 # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
168164 # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
169− ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
170− ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
171− ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
172− ];
165+ ]; # TODO: VA-API patches (we should be able to drop enable-video-acceleration-on-linux.patch now):
166+ # ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
167+ # ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
168+ # ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
169+ # ];
173170
174− postPatch = optionalString (!versionRange "0" "86") ''
171+ postPatch = ''
175172 # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
176173 substituteInPlace native_client/SConstruct \
177174 --replace "#! -*- python -*-" ""
178175 substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
179176 --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
180− '' + ''
177+
181178 # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
182179 substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
183180 --replace \
@@ -195,11 +192,6 @@ let
195192 '/usr/share/locale/' \
196193 '${glibc}/share/locale/'
197194
198− substituteInPlace ui/gfx/x/BUILD.gn \
199− --replace \
200− '/usr/share/xcb' \
201− '${xorg.xcbproto}/share/xcb/'
202−
203195 sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
204196 chrome/browser/shell_integration_linux.cc
205197