Skip to content

[staging-next] qt5.qtdeclarative: Fix build on x86_64-darwin #448633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 1 commit into from
Oct 5, 2025
Merged

[staging-next] qt5.qtdeclarative: Fix build on x86_64-darwin #448633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading