From 05a1cba10bbaa866572a86b1cdfa743acd21e024 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 30 May 2022 00:21:58 +0800 Subject: qt6.qtwebengine: fix LibraryExecutablesPath --- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries/qt-6') diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 81782144c75d6..c8e43d72bb71a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -116,13 +116,6 @@ qtModule rec { 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!' \ 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 \ --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + # Patch library paths in sources substituteInPlace src/core/web_engine_library_info.cpp \ --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 = [ @@ -232,6 +227,12 @@ qtModule rec { requiredSystemFeatures = [ "big-parallel" ]; + postInstall = '' + # This is required at runtime + mkdir $out/libexec + mv $dev/libexec/QtWebEngineProcess $out/libexec + ''; + meta = with lib; { description = "A web engine based on the Chromium web browser"; platforms = platforms.linux; -- cgit 1.4.1