Skip to content

Commit f72f529

Browse files
committed
musescore: fix build with Qt 6.9
1 parent 8ec9b16 commit f72f529

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

pkgs/applications/audio/musescore/default.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5+
fetchpatch,
56
cmake,
67
wrapGAppsHook3,
78
wrapQtAppsHook,
@@ -44,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
4445
sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg=";
4546
};
4647

48+
# Backport + additional patch to fix build on Qt 6.9
49+
# FIXME: remove when no longer required
50+
patches = [
51+
(fetchpatch {
52+
url = "https://github.com/musescore/MuseScore/commit/05056ed19520060c3912a09a3adfa0927057f956.patch";
53+
hash = "sha256-50Hytuu2lQRbAI2JEwlKeMUmJxTUtfqgwru6U760hAY=";
54+
})
55+
./qt-6.9.patch
56+
];
57+
4758
cmakeFlags = [
4859
"-DMUSE_APP_BUILD_MODE=release"
4960
# Disable the build and usage of the `/bin/crashpad_handler` utility - it's
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/palette/view/widgets/specialcharactersdialog.cpp b/src/palette/view/widgets/specialcharactersdialog.cpp
2+
index 2fe07bdb8f..dfcae1ded7 100644
3+
--- a/src/palette/view/widgets/specialcharactersdialog.cpp
4+
+++ b/src/palette/view/widgets/specialcharactersdialog.cpp
5+
@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode()
6+
std::shared_ptr<FSymbol> fs = std::make_shared<FSymbol>(gpaletteScore->dummy());
7+
fs->setCode(code);
8+
fs->setFont(m_font);
9+
- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0')));
10+
+ m_pUnicode->appendElement(fs, QString("0x%1").arg((uint32_t)code, 5, 16, QLatin1Char('0')));
11+
}
12+
}
13+

0 commit comments

Comments
 (0)