Merge pull request #53138 from gnidorah/sway
nixos/sway: Improve the wrapper
This commit is contained in:
commit
65c953976c
|
@ -7,11 +7,18 @@ let
|
||||||
swayPackage = pkgs.sway;
|
swayPackage = pkgs.sway;
|
||||||
|
|
||||||
swayWrapped = pkgs.writeShellScriptBin "sway" ''
|
swayWrapped = pkgs.writeShellScriptBin "sway" ''
|
||||||
if [[ "$#" -ge 1 ]]; then
|
set -o errexit
|
||||||
|
|
||||||
|
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
|
||||||
|
export _SWAY_WRAPPER_ALREADY_EXECUTED=1
|
||||||
|
${cfg.extraSessionCommands}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||||
|
export DBUS_SESSION_BUS_ADDRESS
|
||||||
exec sway-setcap "$@"
|
exec sway-setcap "$@"
|
||||||
else
|
else
|
||||||
${cfg.extraSessionCommands}
|
exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@"
|
||||||
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
|
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
swayJoined = pkgs.symlinkJoin {
|
swayJoined = pkgs.symlinkJoin {
|
||||||
|
|
Loading…
Reference in a new issue