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: 331755f959b3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b56b28a5ad9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 26, 2018

  1. nixos/sway-beta: pass arguments from wrapper to sway

    @bbigras
    bbigras committed Nov 26, 2018
    Copy the full SHA
    cc21100 View commit details

Commits on Nov 27, 2018

  1. Merge pull request #51065 from bbigras/sway 

    nixos/sway-beta: pass arguments from wrapper to sway
    @infinisil
    infinisil authored Nov 27, 2018
    Copy the full SHA
    5b56b28 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/programs/sway-beta.nix
2 changes: 1 addition & 1 deletion nixos/modules/programs/sway-beta.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ let

swayWrapped = pkgs.writeShellScriptBin "sway" ''
${cfg.extraSessionCommands}
exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway
exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway "$@"
'';
swayJoined = pkgs.symlinkJoin {
name = "sway-joined";