From 17016c0ca0d7d82636d200b0e967f08f61a5f76c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 18 Jul 2025 09:48:11 +0200 Subject: [PATCH] mir_2_15: Apply patch to fix compat with newer GTest --- pkgs/servers/mir/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 36064f9aa178..70da32a40b53 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -79,6 +79,18 @@ in ]; hash = "sha256-jVhVR7wZZZGRS40z+HPNoGBLHulvE1nHRKgYhQ6/g9M="; }) + + # Fix compat with newer GTest + # Remove when version > 2.21.1 + (fetchpatch { + name = "0201-Fix-gtest-nodiscard-error.patch"; + url = "https://github.com/canonical/mir/commit/60dab2b197deb159087e44865e7314ad2865b79d.patch"; + includes = [ + "tests/integration-tests/input/test_single_seat_setup.cpp" + "tests/unit-tests/input/test_default_input_device_hub.cpp" + ]; + hash = "sha256-gzLVQW9Z6y+s2D7pKtp0ondQrjkzZ5iUYhGDPqFXD5M="; + }) ]; }; }