summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-12-23 20:19:41 +0100
committerMichael Weiss <dev.primeos@gmail.com>2022-01-23 19:21:37 +0100
commit2e719d1cdab9e81750c19425a1f5c7678b5e73ad (patch)
tree4a96da05bc3ad5e04cf2ea5e23ced05a7d819219 /pkgs/applications/window-managers
parent2cb6012dfc9eb4f301391b944b3bf95151e24498 (diff)
downloadnixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar.gz
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar.bz2
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar.lz
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar.xz
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.tar.zst
nixpkgs-2e719d1cdab9e81750c19425a1f5c7678b5e73ad.zip
sway: 1.6.1 -> 1.7
Release notes: https://github.com/swaywm/sway/releases/tag/1.7

Notable (backward incompatible) changes:
- The default terminal changed from Alacritty to foot

Known issues:
- `swaynag` will crash when Sway 1.6.1 is still running while the Nix
  package (and thus `swaynag`) is already updated to version 1.7.
- The experimental Ozone/Wayland support of Electron apps will be broken
  for a while. Electron version 17 should work but the Chromium fixes
  haven't yet been backported to Electron version 16.

NixOS module: programs.sway.extraPackages: The "alacritty" package was
replaced with "foot".

VM test: We switched from the OpenGL ES 2.0 renderer to Pixman. The
terminal was also changed to foot but Alacritty is still used for the
XWayland test (since foot doesn't support X11).

Co-authored-by: Patrick Hilhorst <git@hilhorst.be>
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/sway/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index ec08568f058..72ca71d5896 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, substituteAll, swaybg
-, meson, ninja, pkg-config, wayland-scanner, scdoc
+, meson_0_60, ninja, pkg-config, wayland-scanner, scdoc
 , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
 , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
 , wlroots, wayland-protocols, libdrm
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sway-unwrapped";
-  version = "1.6.1";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j";
+    sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l";
   };
 
   patches = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson ninja pkg-config wayland-scanner scdoc
+    meson_0_60 ninja pkg-config wayland-scanner scdoc
   ];
 
   buildInputs = [