Commit 23162852 authored by dramforever's avatar dramforever
Browse files

qt5.qtdeclarative: Fix build on x86_64-darwin 

Even though this patch is really for Qt 6, the code affected was
unchanged, and the patch applies cleanly.

Patch is temporarily conditional on x86_64-darwin to avoid extra
rebuilds on staging-next.
parent f8d669f4

pkgs/development/libraries/qt-5/5.15/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -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