qt5.qtdeclarative: Fix build on x86_64-darwin (#448633)

2025-10-05 07:59:00 +02:00
parent 463b83a00d 2316285247
commit 299989070c
1 changed files with 10 additions and 0 deletions
@@ -65,6 +65,16 @@ let
      ./qtdeclarative-default-disable-qmlcache.patch
      # add version specific QML import path
      ./qtdeclarative-qml-paths.patch
+    ]
+    # FIXME: Make unconditional on next staging cycle
+    ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
+      # Fix an undefined behavior, and fix random-seeming build error with Clang. See:
+      # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847
+      # - https://github.com/llvm/llvm-project/issues/74070
+      (fetchpatch {
+        url = "https://github.com/qt/qtdeclarative/commit/636481a31110f1819efaf6500b25fbc395854311.patch";
+        hash = "sha256-ACOG3IjR0SIlLYioODGdhkNTGNvnKu6iOihsVdzyvgo=";
+      })
    ];
    qtlocation = lib.optionals stdenv.cc.isClang [
      # Fix build with Clang 16