From f8f71bb978e75c49782fc19d0cb4009f670203dd Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sun, 26 Nov 2023 11:19:49 -0500
Subject: [PATCH] Revert "swayfx: wrap like sway"

This reverts commit a1674c57abc9c369467195ccbd5b6fd1d1dd6209.
---
 pkgs/applications/window-managers/sway/wrapper.nix | 3 +--
 pkgs/top-level/all-packages.nix                    | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix
index 056d552caa97..7510e1e9582b 100644
--- a/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/pkgs/applications/window-managers/sway/wrapper.nix
@@ -1,4 +1,5 @@
 { 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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3e5a64dc013..469f80c10f23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32643,11 +32643,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 { };
@@ -32658,8 +32657,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 { };