BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #175306 from linsui/qtwebengine

Browse source 
qt6.qtwebengine: fix LibraryExecutablesPath
This commit is contained in:
Sandro 2022-06-04 15:12:16 +02:00 committed by GitHub
commit bb0c96dbd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View file

@ -116,13 +116,6 @@ qtModule rec {
patchShebangs . patchShebangs .
) )
# Patch library paths in sources
sed -i \
-e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
src/core/web_engine_library_info.cpp
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
@ -132,9 +125,11 @@ qtModule rec {
substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \ substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
# Patch library paths in sources
substituteInPlace src/core/web_engine_library_info.cpp \ substituteInPlace src/core/web_engine_library_info.cpp \
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \ --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
--replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
''; '';
cmakeFlags = [ cmakeFlags = [
@ -232,6 +227,12 @@ qtModule rec {
requiredSystemFeatures = [ "big-parallel" ]; requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# This is required at runtime
mkdir $out/libexec
mv $dev/libexec/QtWebEngineProcess $out/libexec
'';
meta = with lib; { meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64); broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A web engine based on the Chromium web browser"; description = "A web engine based on the Chromium web browser";