dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #227077 from euank/qt6-xkb

Browse Source 
qt6.qtwebengine: patch to fix xkb layout crash
This commit is contained in:
Nick Cao 2023-04-20 17:50:25 +08:00 committed by GitHub
commit 1e1a6dc890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View File

@ -127,10 +127,14 @@ qtModule {
# which cannot be set at the same time as -Wformat-security # which cannot be set at the same time as -Wformat-security
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
# removes macOS 12+ dependencies
patches = [ patches = [
# removes macOS 12+ dependencies
../patches/qtwebengine-darwin-no-low-latency-flag.patch ../patches/qtwebengine-darwin-no-low-latency-flag.patch
../patches/qtwebengine-darwin-no-copy-certificate-chain.patch ../patches/qtwebengine-darwin-no-copy-certificate-chain.patch
# Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
# environment variable, since NixOS relies on it working.
# See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
../patches/qtwebengine-xkb-includes.patch
]; ];
postPatch = '' postPatch = ''
@ -161,9 +165,6 @@ qtModule {
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc 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"
'' ''
+ lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.cmake \ substituteInPlace configure.cmake \

12
pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc 2023-04-19 21:58:29.127258300 +0900
+++ b/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc 2023-04-19 22:01:35.860196284 +0900
@@ -637,8 +637,7 @@
.variant = layout_variant.c_str(),
.options = ""};
std::unique_ptr<xkb_context, XkbContextDeleter> context;
- context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES));
- xkb_context_include_path_append(context.get(), "/usr/share/X11/xkb");
+ context.reset(xkb_context_new(XKB_CONTEXT_NO_FLAGS));
std::unique_ptr<xkb_keymap, XkbKeymapDeleter> keymap;
keymap.reset(xkb_keymap_new_from_names(context.get(), &names,
XKB_KEYMAP_COMPILE_NO_FLAGS));