From c1295e616427efbf1b7e85ad129a47693e3eaf1b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 17 Sep 2024 21:58:08 +0200
Subject: [PATCH] mir: 2.17.2 -> 2.18.0

---
 pkgs/servers/mir/common.nix  | 44 ++++++++++++++++++++----------------
 pkgs/servers/mir/default.nix |  4 ++--
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index 87dd45711047..845080eca85e 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -12,6 +12,7 @@
   glib,
   glm,
   glog,
+  libapparmor,
   libdrm,
   libepoxy,
   libevdev,
@@ -58,28 +59,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit patches;
 
-  postPatch = ''
-    # Fix scripts that get run in tests
-    patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
+  postPatch =
+    ''
+      # Fix scripts that get run in tests
+      patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
 
-    # Fix LD_PRELOADing in tests
-    substituteInPlace \
-      cmake/MirCommon.cmake \
-      tests/umock-acceptance-tests/CMakeLists.txt \
-      tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
-      tests/unit-tests/CMakeLists.txt \
-      --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
-      --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
+      # Fix LD_PRELOADing in tests
+      substituteInPlace \
+        cmake/MirCommon.cmake \
+        tests/umock-acceptance-tests/CMakeLists.txt \
+        tests/unit-tests/platforms/gbm-kms/kms/CMakeLists.txt \
+        tests/unit-tests/CMakeLists.txt \
+        --replace-warn 'LD_PRELOAD=liblttng-ust-fork.so' 'LD_PRELOAD=${lib.getLib lttng-ust}/lib/liblttng-ust-fork.so' \
+        --replace-warn 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0'
 
-    # Fix Xwayland default
-    substituteInPlace src/miral/x11_support.cpp \
-      --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
+      # Fix Xwayland default
+      substituteInPlace src/miral/x11_support.cpp \
+        --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'
+    ''
+    + lib.optionalString (lib.strings.versionOlder version "2.18.0") ''
 
-    # Fix paths for generating drm-formats
-    substituteInPlace src/platform/graphics/CMakeLists.txt \
-      --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
-      --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
-  '';
+      # Fix paths for generating drm-formats
+      substituteInPlace src/platform/graphics/CMakeLists.txt \
+        --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \
+        --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h"
+    '';
 
   strictDeps = true;
 
@@ -127,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libXcursor
     xorg.xorgproto
     xwayland
-  ];
+  ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];
 
   nativeCheckInputs = [
     dbus
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index eee124bde90f..f899185da2bf 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.17.2";
-    hash = "sha256-OwOGt3X7+UchksyPf/sodit2PHpSlpP2S3gkCPcdzfE=";
+    version = "2.18.0";
+    hash = "sha256-Sy7sDlOP34M9zyNorX0loP21B/dd/7Zew8wcuEcjjUY=";
   };
 
   mir_2_15 = common {