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.

Sign up for GitHub

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

Jump to bottom

nixos/sway-beta: pass arguments from wrapper to sway #51065

Merged
merged 1 commit into from
Nov 27, 2018
Merged

nixos/sway-beta: pass arguments from wrapper to sway #51065

merged 1 commit into from
Nov 27, 2018
+1 −1

Conversation

bbigras
Copy link
Contributor

@bbigras bbigras commented Nov 26, 2018

Motivation for this change

The sway-beta wrapper doesn't pass the arguments like the stable sway wrapper do.

Note that I'm not doing it the same way as in the sway.nix file. Which is:

nixpkgs/nixos/modules/programs/sway.nix

Lines 9 to 16 in 128a446

swayWrapped = pkgs.writeShellScriptBin "sway" ''
if [[ "$#" -ge 1 ]]; then
exec sway-setcap "$@"
else
${cfg.extraSessionCommands}
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
fi
'';

I'm not sure which way is better. My way seems to work. I can launch sway using sway and check the config using sway -C.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@bbigras bbigras requested a review from infinisil as a code owner November 26, 2018 16:56
@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 26, 2018
@infinisil infinisil merged commit 5b56b28 into NixOS:master Nov 27, 2018
@bbigras bbigras deleted the sway branch November 27, 2018 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bbigras @infinisil @GrahamcOfBorg