ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

swayfx: wrap like sway

Browse Source 
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
This commit is contained in:
Kira Bruneau 2023-11-25 18:42:11 -05:00
parent 0bd59c54ef
commit a1674c57ab
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/window-managers/sway/fx.nix
View File

@ -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

3
pkgs/applications/window-managers/sway/wrapper.nix
View File

@ -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;

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };