diff options
| author | OPNA2608 <opna2608@protonmail.com> | 2024-06-03 21:04:01 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-06-16 09:19:04 +0000 |
| commit | c7c2cd94040f82d84751f6567513c172773c4f0f (patch) | |
| tree | d49e574948f75620e2023b666666c907f1feaf00 | |
| parent | Merge pull request #319547 from OPNA2608/backport/24.05/update/lomiri/qtmir (diff) | |
| download | nixpkgs-c7c2cd94040f82d84751f6567513c172773c4f0f.tar.gz | |
lomiri.lomiri-session: Unset QT_QPA_PLATFORMTHEME
Workaround startup failure when Pantheon module sets it to "gtk3" globally.
(cherry picked from commit ad9b2ad91250d88cae94cebf29797926d3bc274a)
| -rw-r--r-- | pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch | 33 | ||||
| -rw-r--r-- | pkgs/desktops/lomiri/data/lomiri-session/default.nix | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch new file mode 100644 index 000000000000..8edf093d4ed3 --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch @@ -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 + diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index c62e4ab572bd..351aed9de824 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -135,6 +135,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { excludes = [ "systemd/lomiri.service" ]; hash = "sha256-BICb6ZwU/sUBzmM4udsOndIgw1A03I/UEG000YvMZ9Y="; }) + + ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ]; postPatch = '' |