diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d1192e700c50..9991fcc75ff4 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcfbf2c27ec0..3f7eb76d0a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };