Unverified Commit 8d16f1e8 authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

Merge pull request #270185 from kira-bruneau/swayfx 

Revert "swayfx: wrap like sway"
parents c1e9dde1 f8f71bb9

pkgs/applications/window-managers/sway/wrapper.nix

+1 −2
Original line number Diff line number Diff line 
{ lib

, sway-unwrapped

, makeWrapper, symlinkJoin, writeShellScriptBin

, withBaseWrapper ? true, extraSessionCommands ? "", dbus

, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3
@@ -10,8 +11,6 @@ 
, dbusSupport ? true

}:



sway-unwrapped:



assert extraSessionCommands != "" -> withBaseWrapper;



with lib;

pkgs/top-level/all-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -32641,11 +32641,10 @@ with pkgs; 
    wlroots_0_16

    wlroots;













  wrapSway = callPackage ../applications/window-managers/sway/wrapper.nix { };















  sway-unwrapped = callPackage ../applications/window-managers/sway {















    wlroots = wlroots_0_16;















  };













  sway = wrapSway sway-unwrapped;













  sway = callPackage ../applications/window-managers/sway/wrapper.nix { };















  swaybg = callPackage ../applications/window-managers/sway/bg.nix { };















  swayidle = callPackage ../applications/window-managers/sway/idle.nix { };















  swaylock = callPackage ../applications/window-managers/sway/lock.nix { };









@@ -32656,8 +32655,7 @@ with pkgs;



























  swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { };



























  swayfx-unwrapped = callPackage ../applications/window-managers/sway/fx.nix { };













  swayfx = wrapSway swayfx-unwrapped;













  swayfx = callPackage ../applications/window-managers/sway/fx.nix { };





























  swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { };