colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

phog: remove DesktopNames==null workaround

Browse Source
This commit is contained in:
Colin 2023-09-24 17:24:29 +00:00
parent e8d2aeb3a6
commit 3ab943ab0b
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/modules/gui/sway/default.nix
View File

@ -27,6 +27,8 @@ let
mkdir -p $out/share/wayland-sessions
substitute ${origSway}/share/wayland-sessions/sway.desktop $out/share/wayland-sessions/sway.desktop \
--replace 'Exec=sway' 'Exec=${swayWithLogger}/bin/sway-session'
# XXX(2023/09/24) phog greeter (mobile greeter) will crash if DesktopNames is not set
echo "DesktopNames=Sway" >> $out/share/wayland-sessions/sway.desktop
'';
in pkgs.symlinkJoin {
inherit (origSway) name meta;

4
pkgs/additional/phog/default.nix
View File

@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
# url = "https://gitlab.com/mobian1/phog/-/commit/ad1a2b876a1205f0927c7c02e0471364d557e3fe.patch";
# hash = "sha256-gYQLDCKNIc4xPtgKRMzH4fmayx5w2oED2FjkD7fKswA=";
# })
# somehow ignoring session_info's w/o DesktopNames causes a segfault...
# this patch reverts part of the following change: <https://gitlab.com/mobian1/phog/-/merge_requests/3>
# TODO: probably i can fix up my sessions to include DesktopNames, and then remove this patch
./dont-skip-sessions-without-DesktopNames.patch
./sway-compat.patch
];

16
pkgs/additional/phog/dont-skip-sessions-without-DesktopNames.patch
View File

@ -1,16 +0,0 @@
diff --git a/src/greetd.c b/src/greetd.c
index 71d0b68c..831a68a2 100644
--- a/src/greetd.c
+++ b/src/greetd.c
@@ -146,11 +146,6 @@ greetd_list_sessions_in_folder (PhogGreetd *self, const gchar *path, const gchar
g_app_info_get_commandline (G_APP_INFO (session_info)));
desktop_names = g_desktop_app_info_get_string (session_info, "DesktopNames");
- if (!desktop_names) {
- g_warning ("No DesktopNames in %s - ignoring", session_id);
- continue;
- }
-
if (g_str_has_suffix (desktop_names, ";")) {
desktop_names[strlen (desktop_names) - 1] = '\0';
}