diff options
author | Kira Bruneau <kira.bruneau@pm.me> | 2023-11-25 18:42:11 -0500 |
---|---|---|
committer | Kira Bruneau <kira.bruneau@pm.me> | 2023-11-25 18:51:39 -0500 |
commit | a1674c57abc9c369467195ccbd5b6fd1d1dd6209 (patch) | |
tree | 8e488e4927cb482514a719333027e990c8277ffa /pkgs | |
parent | 0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1 (diff) |
swayfx: wrap like sway
The current implementation of swayfx is unwrapped, we should wrap it like we wrap swayfx for consistency. Simpler alternative to #267261 & #234243 Fixes WillPower3309/swayfx#161
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/sway/fx.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/window-managers/sway/wrapper.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/sway/fx.nix b/pkgs/applications/window-managers/sway/fx.nix index 02afaba70774c..16ab1903ab011 100644 --- a/pkgs/applications/window-managers/sway/fx.nix +++ b/pkgs/applications/window-managers/sway/fx.nix @@ -27,9 +27,10 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec { meta = with lib; { description = "Sway, but with eye candy!"; homepage = "https://github.com/WillPower3309/swayfx"; - maintainers = with maintainers; [ ricarch97 ]; license = licenses.mit; + maintainers = with maintainers; [ ricarch97 ]; platforms = platforms.linux; + mainProgram = "swayfx"; longDescription = '' Fork of Sway, an incredible and one of the most well established Wayland diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7510e1e9582b3..056d552caa972 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -1,5 +1,4 @@ { lib -, sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 @@ -11,6 +10,8 @@ , 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 628164ee570d7..d2f5226b5e8f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32647,10 +32647,11 @@ 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 = callPackage ../applications/window-managers/sway/wrapper.nix { }; + sway = wrapSway sway-unwrapped; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; @@ -32661,7 +32662,8 @@ with pkgs; swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { }; - swayfx = callPackage ../applications/window-managers/sway/fx.nix { }; + swayfx-unwrapped = callPackage ../applications/window-managers/sway/fx.nix { }; + swayfx = wrapSway swayfx-unwrapped; swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; |