Merge pull request #246038 from Philipp-M/chromium-no-patched-xdg-utils

chromium: remove xdg-utils build dependency as it is wrapped later anyway
This commit is contained in:
Emily 2024-03-02 18:22:25 +01:00 committed by GitHub
commit 78dc4618f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -25,7 +25,7 @@
, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libcap
, xdg-utils, minizip, libwebp
, minizip, libwebp
, libusb1, re2
, ffmpeg, libxslt, libxml2
, nasm
@ -184,9 +184,6 @@ let
bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy
libcap
] ++ lib.optionals (!xdg-utils.meta.broken) [
xdg-utils
] ++ [
minizip libwebp
libusb1 re2
ffmpeg libxslt libxml2
@ -295,10 +292,6 @@ let
'/usr/share/locale/' \
'${glibc}/share/locale/'
'' + lib.optionalString (!xdg-utils.meta.broken) ''
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
'' + lib.optionalString systemdSupport ''
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc