Merge pull request #55117 from primeos/sway

sway-beta: 1.0-beta.2 -> 1.0-rc1

nixos/modules/programs/sway-beta.nix

@@ -60,10 +60,11 @@ in {
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
+        swaylock swayidle
         xwayland rxvt_unicode dmenu
       ];
       defaultText = literalExample ''
-        with pkgs; [ xwayland rxvt_unicode dmenu ];
+        with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ];
       '';
       example = literalExample ''
         with pkgs; [

pkgs/applications/window-managers/sway/beta.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , meson, ninja
 , pkgconfig, scdoc
-, wayland, libxkbcommon, pcre, json_c, dbus
+, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
 , pango, cairo, libinput, libcap, pam, gdk_pixbuf
 , wlroots, wayland-protocols
 , buildDocs ? true
@@ -10,13 +10,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "sway";
-  version = "1.0-beta.2";
+  version = "1.0-rc1";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw";
+    sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz";
   };
 
   nativeBuildInputs = [
@@ -24,14 +24,17 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional buildDocs scdoc;
 
   buildInputs = [
-    wayland libxkbcommon pcre json_c dbus
+    wayland libxkbcommon pcre json_c dbus libevdev
     pango cairo libinput libcap pam gdk_pixbuf
     wlroots wayland-protocols
   ];
 
   enableParallelBuilding = true;
 
-  mesonFlags = "-Dsway-version=${version}";
+  mesonFlags = [
+    "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
+    "-Dman-pages=enabled" "-Dtray=enabled"
+  ];
 
   meta = with stdenv.lib; {
     description = "i3-compatible window manager for Wayland";

pkgs/development/libraries/wlroots/default.nix

@@ -6,7 +6,7 @@
 
 let
   pname = "wlroots";
-  version = "0.2";
+  version = "0.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -14,14 +14,9 @@ in stdenv.mkDerivation rec {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv";
+    sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs";
   };
 
-  postPatch = ''
-    substituteInPlace meson.build \
-      --replace "version: '0.1.0'" "version: '${version}.0'"
-  '';
-
   # $out for the library, $bin for rootston, and $examples for the example
   # programs (in examples) AND rootston
   outputs = [ "out" "bin" "examples" ];
@@ -39,6 +34,11 @@ in stdenv.mkDerivation rec {
     "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
   ];
 
+  postPatch = ''
+    # It happens from time to time that the version wasn't updated:
+    sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
+  '';
+
   postInstall = ''
     # Install rootston (the reference compositor) to $bin and $examples
     for output in "$bin" "$examples"; do