movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

musescore: fix build with Qt 6.9

Browse source
This commit is contained in:
K900 2025-04-13 14:08:27 +03:00
parent 8ec9b16856
commit f72f529cbf
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/audio/musescore/default.nix
View file

@ -2,6 +2,7 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
cmake, cmake,
wrapGAppsHook3, wrapGAppsHook3,
wrapQtAppsHook, wrapQtAppsHook,
@ -44,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg="; sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg=";
}; };
# Backport + additional patch to fix build on Qt 6.9
# FIXME: remove when no longer required
patches = [
(fetchpatch {
url = "https://github.com/musescore/MuseScore/commit/05056ed19520060c3912a09a3adfa0927057f956.patch";
hash = "sha256-50Hytuu2lQRbAI2JEwlKeMUmJxTUtfqgwru6U760hAY=";
})
./qt-6.9.patch
];
cmakeFlags = [ cmakeFlags = [
"-DMUSE_APP_BUILD_MODE=release" "-DMUSE_APP_BUILD_MODE=release"
# Disable the build and usage of the `/bin/crashpad_handler` utility - it's # Disable the build and usage of the `/bin/crashpad_handler` utility - it's

13
pkgs/applications/audio/musescore/qt-6.9.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/palette/view/widgets/specialcharactersdialog.cpp b/src/palette/view/widgets/specialcharactersdialog.cpp
index 2fe07bdb8f..dfcae1ded7 100644
--- a/src/palette/view/widgets/specialcharactersdialog.cpp
+++ b/src/palette/view/widgets/specialcharactersdialog.cpp
@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode()
std::shared_ptr<FSymbol> fs = std::make_shared<FSymbol>(gpaletteScore->dummy());
fs->setCode(code);
fs->setFont(m_font);
- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0')));
+ m_pUnicode->appendElement(fs, QString("0x%1").arg((uint32_t)code, 5, 16, QLatin1Char('0')));
}
}