Merge pull request #317000 from OPNA2608/fix/lomiri-QT_QPA_PLATFORMTHEME-issue

lomiri.lomiri-session: Unset QT_QPA_PLATFORMTHEME
This commit is contained in:
Cosima Neidahl 2024-06-16 11:18:39 +02:00 committed by GitHub
commit dbde1d9063
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,33 @@
From 30b5391c3f20180fe7427fe179ba26f846200d96 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 3 Jun 2024 20:50:03 +0200
Subject: [PATCH] Unset QT_QPA_PLATFORMTHEME
gtk3 value breaks Lomiri startup
---
lomiri-session | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lomiri-session b/lomiri-session
index 9d68249..b103840 100755
--- a/lomiri-session
+++ b/lomiri-session
@@ -47,6 +47,7 @@ fi
# Set some envs
export QT_QPA_PLATFORM=wayland
+export QT_QPA_PLATFORMTHEME=
export QT_IM_MODULE=maliit
export MALIIT_FORCE_DBUS_CONNECTION=1
export UITK_ICON_THEME=suru
@@ -55,6 +56,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1
dbus-update-activation-environment --systemd QT_IM_MODULE=maliit
dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit
dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland
+dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME=
dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1
dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1
--
2.44.1

View File

@ -135,6 +135,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
excludes = [ "systemd/lomiri.service" ];
hash = "sha256-BICb6ZwU/sUBzmM4udsOndIgw1A03I/UEG000YvMZ9Y=";
})
./1001-Unset-QT_QPA_PLATFORMTHEME.patch
];
postPatch = ''