vcmi: fix build with GCC 15; libsquish: fix build on aarch64-linux (#516751)

2026-05-05 13:18:42 +00:00
parent ac7b8429d9 c229b36494
commit fc9697133f
2 changed files with 5 additions and 1 deletions
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
  cmakeFlags = [
    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
-  ];
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isx86) (lib.cmakeBool "BUILD_SQUISH_WITH_SSE2" false);

  meta = {
    description = "Library for compressing images with the DXT/S3TC standard";
@@ -66,6 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optional enableMMAI onnxruntime;

+  # GCC 15 ICE in -Wmismatched-tags diagnostic during template specialisation lookup
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-mismatched-tags";
+
  cmakeFlags = [
    (lib.cmakeBool "ENABLE_CLIENT" true)
    (lib.cmakeBool "ENABLE_LUA" true)