Fix catch2 failing to build due to alignment

See catchorg/Catch2#2808
AlexandreTunstall · Apr 2, 2024 · a156b11 · a156b11
1 parent 4c4206d
commit a156b11
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/overlays/catch2-data-align.patch b/overlays/catch2-data-align.patch
@@ -0,0 +1,10 @@
+--- a/src/catch2/benchmark/catch_constructor.hpp
++++ b/src/catch2/benchmark/catch_constructor.hpp
+@@ -67,7 +67,7 @@
+ #    pragma GCC diagnostic pop
+ #endif
+
+-                alignas( T ) unsigned char data[sizeof( T )]{};
++                alignas( T, T* ) unsigned char data[sizeof( T )]{};
+             };
+         } // namespace Detail
diff --git a/overlays/riscv-fixes.nix b/overlays/riscv-fixes.nix
@@ -3,7 +3,13 @@ self: super: let
     doCheck = false;
   });
 
+  appendPatches = newPatches: drv: drv.overrideAttrs ({ patches ? [], ... }: {
+    patches = patches ++ newPatches;
+  });
+
 in {
+  catch2_3 = appendPatches [ ./catch2-data-align.patch ] super.catch2_3;
+
   libbsd = dontCheck super.libbsd;
   libuv = dontCheck super.libuv;
   pixman = dontCheck super.pixman;