Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

river: fix systemd activation (#5055)

Browse source 
The `exec` command does not do any shell parsing and does not
understand the `&&` which is how the extraCommands are added after
dbus activation. There doesn't seem to be a reason for `exec` here
anyway so just remove it and allow shell parsing.
This commit is contained in:
John Axel Eriksson 2024-02-29 11:10:25 +01:00 committed by GitHub
parent 1d085ea444
commit ecfffe3631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/window-managers/river.nix
View file

@ -9,7 +9,7 @@ let
extraCommands = builtins.concatStringsSep " " extraCommands = builtins.concatStringsSep " "
(map (f: "&& ${f}") cfg.systemd.extraCommands); (map (f: "&& ${f}") cfg.systemd.extraCommands);
systemdActivation = '' systemdActivation = ''
exec "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables} ${extraCommands}" ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd ${variables} ${extraCommands}
''; '';
toValue = val: toValue = val:

2
tests/modules/services/window-managers/river/init
View file

@ -62,6 +62,6 @@ extra config
### SYSTEMD INTEGRATION ### ### SYSTEMD INTEGRATION ###
exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target" @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target