Commit a1674c57 authored by Kira Bruneau's avatar Kira Bruneau
Browse files

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
parent 0bd59c54
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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
+2 −1
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
@@ -11,6 +10,8 @@
, dbusSupport ? true
}:

sway-unwrapped:

assert extraSessionCommands != "" -> withBaseWrapper;

with lib;
+4 −2
Original line number Diff line number Diff line
@@ -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 { };