diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-12-26 23:37:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-26 23:37:19 +0100 |
| commit | 7f8750b1fefdd22e365e7b89aef1a64fc8ba6c4b (patch) | |
| tree | 7324d07a0dcd7ade34144a0356b484a7ad2e0648 /pkgs/applications/window-managers | |
| parent | f2a15bc22fa14a91b6f6a2e01bf4ff4db72528e3 (diff) | |
| parent | 9896c8830321c1ec6e1e6b5232c0e023db8d2fb7 (diff) | |
Merge pull request #203221 from primeos/sway
sway: 1.7 -> 1.8
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 61925e4ed0be3..e49edbd190930 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre, json_c, libevdev +, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg -, wlroots, wayland-protocols, libdrm +, wlroots_0_16, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false -, enableXWayland ? true +, enableXWayland ? true, xorg , systemdSupport ? stdenv.isLinux , dbusSupport ? true , dbus @@ -23,13 +23,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"; + hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; }; patches = [ @@ -59,12 +59,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wayland libxkbcommon pcre json_c libevdev + wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput libcap pam gdk-pixbuf librsvg wayland-protocols libdrm - (wlroots.override { inherit enableXWayland; }) + (wlroots_0_16.override { inherit enableXWayland; }) ] ++ lib.optionals dbusSupport [ dbus + ] ++ lib.optionals enableXWayland [ + xorg.xcbutilwm ]; mesonFlags = |