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

Merge pull request #31371 from gnidorah/sway

Browse Source 
sway module: passthrough sway binary when needed
This commit is contained in:
Franz Pletz 2017-11-24 10:03:41 +01:00 committed by GitHub
commit 3ad0845fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/programs/sway.nix
View File

@ -8,8 +8,11 @@ let
swayWrapped = pkgs.writeScriptBin "sway" '' swayWrapped = pkgs.writeScriptBin "sway" ''
#! ${pkgs.stdenv.shell} #! ${pkgs.stdenv.shell}
if [ "$1" != "" ]; then
sway-setcap "$@"
exit
fi
${cfg.extraSessionCommands} ${cfg.extraSessionCommands}
PATH="${sway}/bin:$PATH"
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
''; '';
swayJoined = pkgs.symlinkJoin { swayJoined = pkgs.symlinkJoin {