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

signal-desktop: remove NIXOS_OZONE_WL=1 hack (no longer required)

Browse Source
This commit is contained in:
Colin 2024-05-15 00:10:00 +00:00
parent 66f73c92bd
commit f9a6873ee9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/common/programs/signal-desktop.nix
View File

@ -48,9 +48,7 @@ in
description = "signal-desktop Signal Messenger client"; description = "signal-desktop Signal Messenger client";
# depends = [ "graphical-session" ]; # depends = [ "graphical-session" ];
partOf = lib.mkIf cfg.config.autostart [ "graphical-session" ]; partOf = lib.mkIf cfg.config.autostart [ "graphical-session" ];
command = "signal-desktop";
# for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service
command = "env NIXOS_OZONE_WL=1 signal-desktop";
}; };
}; };
} }

2
pkgs/additional/signal-desktop-from-src/default.nix
View File

@ -393,7 +393,7 @@ stdenv.mkDerivation rec {
--add-flags $out/lib/Signal/resources/app.asar \ --add-flags $out/lib/Signal/resources/app.asar \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--add-flags --ozone-platform-hint=auto \ --add-flags --ozone-platform-hint=auto \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ --add-flags "\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}" \
--inherit-argv0 --inherit-argv0
''; '';