public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sway: Make it possible to use exec in extraSessionCommands

Browse Source 
This is useful for use-cases like this (logging to journald):
```
programs.sway.extraSessionCommands = ''
  if [ -z "$_SWAY_DID_SYSTEMD_CAT" ]; then
    export _SWAY_DID_SYSTEMD_CAT=1
    exec ${config.systemd.package}/bin/systemd-cat -t sway "$0" "$@"
  fi
  # ... (potentially also another exec)
'';
```

Without this change the rest of the extraSessionCommands won't be
executed after the exec since the whole extraSessionCommands block would
be skipped during the re-execution (_SWAY_WRAPPER_ALREADY_EXECUTED is
already set).
This commit is contained in:
Michael Weiss 2019-12-31 16:28:52 +01:00
parent 63acac6435
commit 1a047c4a8e
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/window-managers/sway/wrapper.nix
View File

@ -14,8 +14,8 @@ let
baseWrapper = writeShellScriptBin "sway" '' baseWrapper = writeShellScriptBin "sway" ''
set -o errexit set -o errexit
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
export _SWAY_WRAPPER_ALREADY_EXECUTED=1
${extraSessionCommands} ${extraSessionCommands}
export _SWAY_WRAPPER_ALREADY_EXECUTED=1
fi fi
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
export DBUS_SESSION_BUS_ADDRESS export DBUS_SESSION_BUS_ADDRESS