From a9633d818d0a08565d078b711d6e661d762400fc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 8 Jul 2025 11:24:52 +0200
Subject: [PATCH] mir: 2.20.2 -> 2.21.0

---
 pkgs/servers/mir/common.nix  | 60 ++++++++++++++++++++----------------
 pkgs/servers/mir/default.nix |  4 +--
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index ccc1150db5b7..a9e66792a87c 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -26,6 +26,7 @@
   lttng-ust,
   libgbm,
   nettle,
+  pixman,
   udev,
   wayland,
   wayland-scanner,
@@ -105,32 +106,39 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs = [
-    boost
-    egl-wayland
-    freetype
-    glib
-    glm
-    libdrm
-    libepoxy
-    libevdev
-    libglvnd
-    libinput
-    libuuid
-    libxcb
-    libxkbcommon
-    libxmlxx
-    yaml-cpp
-    lttng-ust
-    libgbm
-    nettle
-    udev
-    wayland
-    xorg.libX11
-    xorg.libXcursor
-    xorg.xorgproto
-    xwayland
-  ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];
+  buildInputs =
+    [
+      boost
+      egl-wayland
+      freetype
+      glib
+      glm
+      libdrm
+      libepoxy
+      libevdev
+      libglvnd
+      libinput
+      libuuid
+      libxcb
+      libxkbcommon
+      libxmlxx
+      yaml-cpp
+      lttng-ust
+      libgbm
+      nettle
+      udev
+      wayland
+      xorg.libX11
+      xorg.libXcursor
+      xorg.xorgproto
+      xwayland
+    ]
+    ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [
+      libapparmor
+    ]
+    ++ lib.optionals (lib.strings.versionAtLeast version "2.21.0") [
+      pixman
+    ];
 
   nativeCheckInputs = [
     dbus
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index 36064f9aa178..623806cfb378 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.20.2";
-    hash = "sha256-kxXPRIvgvpWqos8l/fJyHvfJBNi0jOZfV5inY3SBavM=";
+    version = "2.21.0";
+    hash = "sha256-WCVh1163ZmT8tHe60AOxSg7AEDXsSekNb7UpbojyIXU=";
   };
 
   mir_2_15 = common {