Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sway: Make it possible to use exec in extraSessionCommands #85783

Merged
merged 1 commit into from Apr 23, 2020

Conversation

@primeos
Copy link
Member

primeos commented Apr 22, 2020

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).

Motivation for this change

I've been using this locally for a while now but forgot to upstream it.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
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).
Copy link
Member

calbrecht left a comment

Interesting use case, thank you :)
LGTM

@primeos
Copy link
Member Author

primeos commented Apr 23, 2020

I'll merge it as this should be fine (at least I hope no one used an unconditional exec in extraSessionCommands to re-execute the script :o - but that's hopefully very unlikely and the only regression I could think of).

@primeos primeos merged commit 71c6721 into NixOS:master Apr 23, 2020
17 checks passed
17 checks passed
sway, sway.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1a047c4"; rev="1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
sway, sway.passthru.tests on aarch64-linux Success
Details
sway, sway.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.