Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4142887d4a99
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5925aebc03b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 3, 2017

  1. sway module: setcap binary, not wrapper

    gnidorah committed Nov 3, 2017
    Copy the full SHA
    194d785 View commit details

  2. Merge pull request #31201 from gnidorah/sway 

    sway module: setcap binary, not wrapper
    @NeQuissimus
    NeQuissimus authored Nov 3, 2017
    Copy the full SHA
    5925aeb View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 nixos/modules/programs/sway.nix
5 changes: 3 additions & 2 deletions nixos/modules/programs/sway.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let
#! ${pkgs.stdenv.shell}
${cfg.extraSessionCommands}
PATH="${sway}/bin:$PATH"
exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway"
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
'';
swayJoined = pkgs.symlinkJoin {
name = "sway-wrapped";
@@ -53,7 +53,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
security.wrappers.sway = {
source = "${swayJoined}/bin/sway";
program = "sway-setcap";
source = "${sway}/bin/sway";
capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
owner = "root";
group = "sway";