From eb67fa3b586bed4ef020452bc17d8e6d8d516d13 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 25 May 2022 00:25:05 +0800 Subject: [PATCH] qt6.qtwebengine: fix resource search paths --- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 400fe6aba125..81782144c75d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -64,6 +64,7 @@ , lcms2 , re2 , libkrb5 +, xkeyboard_config , enableProprietaryCodecs ? true }: @@ -127,6 +128,13 @@ qtModule rec { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.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" + + substituteInPlace src/core/web_engine_library_info.cpp \ + --replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \ + --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" ''; cmakeFlags = [