gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sway-unwrapped: rename wlroots_0_16 argument to wlroots

Browse Source
This commit is contained in:
Matthieu Coudron
2023-06-15 16:50:43 +02:00
parent 9f255a0184
commit c5b7187c10
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/sway/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, meson, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, gdk-pixbuf, librsvg
, wlroots_0_16, wayland-protocols, libdrm
, wlroots, wayland-protocols, libdrm
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
wayland libxkbcommon pcre2 json_c libevdev
pango cairo libinput gdk-pixbuf librsvg
wayland-protocols libdrm
(wlroots_0_16.override { inherit enableXWayland; })
(wlroots.override { inherit enableXWayland; })
] ++ lib.optionals enableXWayland [
xorg.xcbutilwm
];
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -31634,7 +31634,9 @@ with pkgs;
wlroots_0_16
wlroots;
sway-unwrapped = callPackage ../applications/window-managers/sway { };
sway-unwrapped = callPackage ../applications/window-managers/sway {
wlroots = wlroots_0_16;
};
sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };