nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 13:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270185 from kira-bruneau/swayfx

Browse Source 
Revert "swayfx: wrap like sway"
This commit is contained in:
Kira Bruneau 2023-11-26 15:35:38 -05:00 committed by GitHub
commit 8d16f1e8fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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