diff --git a/flake.nix b/flake.nix index 3eb6bc50..21cf183d 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ # Keep in sync with CMakeLists.txt monado rev rev = lib.strings.trim (builtins.readFile ./monado-rev); # Nix will output the correct hash when it doesn't match - hash = "sha256-SzuCQ1uX15vFGwGt3gswlVF2Su8sIND4R3tsTJ4T1LY="; + hash = "sha256-kupGiT6OGR2GQOYDxg/+3Gfdm4pNPxh0kkBmlD9zHAo="; }; }; diff --git a/monado-rev b/monado-rev index 5c610e83..b3412bb1 100644 --- a/monado-rev +++ b/monado-rev @@ -1 +1 @@ -8053730d648e44cad798c528dd9be3b720a718eb +24e2c42e47ad8c9c1049c2a1e71e01b719b0658f diff --git a/patches/monado/0010-Fix-undefined-macro-in-c.patch b/patches/monado/0010-Fix-undefined-macro-in-c.patch deleted file mode 100644 index f07de97b..00000000 --- a/patches/monado/0010-Fix-undefined-macro-in-c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 87161ab6d6668b0c02fe6e462ff3cfc9a356aaed Mon Sep 17 00:00:00 2001 -From: no name -Date: Wed, 29 Jul 2026 23:28:06 +0200 -Subject: [PATCH 10/10] Fix undefined macro in c++ - ---- - src/xrt/include/xrt/xrt_compiler.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/xrt/include/xrt/xrt_compiler.h b/src/xrt/include/xrt/xrt_compiler.h -index 5c8cdf86e..3e4cb1854 100644 ---- a/src/xrt/include/xrt/xrt_compiler.h -+++ b/src/xrt/include/xrt/xrt_compiler.h -@@ -159,7 +159,9 @@ - * - * @todo Remove this macro when Monado is updated project-wide to C23. - */ --#if __STDC_VERSION__ >= 202311L -+#if defined(__cpp_decltype) && __cpp_decltype >= 200707L -+#define XRT_TYPEOF(x) decltype(x) -+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L - #define XRT_TYPEOF(x) typeof(x) - #elif defined(__GNUC__) || defined(__clang__) - #define XRT_TYPEOF(x) __typeof__(x) --- -2.55.0 -