wayland: 1.20.0 -> 1.21.0

Release announcements:
- Alpha: https://lists.freedesktop.org/archives/wayland-devel/2022-May/042194.html
- Beta: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042228.html
- RC1: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042261.html
- 1.21: https://lists.freedesktop.org/archives/wayland-devel/2022-June/042268.html

The URLs of the release tarballs did change as can be seen on the
website [0] (the old URL scheme doesn't work anymore).

[0]: https://wayland.freedesktop.org/releases.html

pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch

@@ -1,25 +0,0 @@
-From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Fri, 27 Nov 2020 10:22:20 +0100
-Subject: [PATCH] add placeholder for @nm@
-
----
- egl/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/egl/meson.build b/egl/meson.build
-index dee9b1d..e477546 100644
---- a/egl/meson.build
-+++ b/egl/meson.build
-@@ -11,7 +11,7 @@ wayland_egl = library(
- 
- executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c')
- 
--nm_path = find_program('nm').path()
-+nm_path = find_program('@nm@').path()
- 
- test(
- 	'wayland-egl symbols check',
--- 
-2.29.2
-

pkgs/development/libraries/wayland/add-placeholder-for-nm.patch

@@ -0,0 +1,13 @@
+diff --git a/egl/meson.build b/egl/meson.build
+index b3cbdf3..cdc15ca 100644
+--- a/egl/meson.build
++++ b/egl/meson.build
+@@ -11,7 +11,7 @@ wayland_egl = library(
+
+ executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c')
+
+-nm_path = find_program('nm').full_path()
++nm_path = find_program('@nm@').full_path()
+
+ test(
+        'wayland-egl symbols check',

pkgs/development/libraries/wayland/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , substituteAll
 , meson
 , pkg-config
@@ -30,16 +29,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "wayland";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
-    url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q";
+    url = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
+    sha256 = "1b0ixya9bfw5c9jx8mzlr7yqnlyvd3jv5z8wln9scdv8q5zlvikd";
   };
 
   patches = [
     (substituteAll {
-      src = ./0001-add-placeholder-for-nm.patch;
+      src = ./add-placeholder-for-nm.patch;
       nm = "${stdenv.cc.targetPrefix}nm";
     })
   ];