diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 4fbcb1a900e1..367fc7cedc99 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -23,7 +23,7 @@ flac, libopusenc, libopus, - tinyxml-2, + mnxdom, kdePackages, # passthru tests @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.6.5"; + version = "4.7.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; tag = "v${finalAttrs.version}"; - hash = "sha256-lfgf09gLeoiXc0xsJvvKAnSJUjy/L2Fdis/9SNjb1KM="; + hash = "sha256-AEYZWkcjqB2pW+oBow2oMX1HQn4kRaTBBxhyxIbG0a4="; }; cmakeFlags = [ @@ -47,9 +47,6 @@ stdenv.mkDerivation (finalAttrs: { # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 (lib.cmakeBool "MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT" false) - # Don't bundle qt qml files, relevant really only for darwin, but we set - # this for all platforms anyway. - (lib.cmakeBool "MUE_COMPILE_INSTALL_QTQML_FILES" false) # Don't build unit tests unless we are going to run them. (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ] @@ -58,10 +55,14 @@ stdenv.mkDerivation (finalAttrs: { ++ map (l: lib.cmakeBool "MUE_COMPILE_USE_SYSTEM_${l}" true) [ "FREETYPE" "HARFBUZZ" - "TINYXML" + "MNXDOM" # Implies also OPUS "OPUSENC" "FLAC" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # https://github.com/musescore/MuseScore/issues/33467 + (lib.cmakeBool "MUE_BUILD_MACOS_INTEGRATION" false) ]; qtWrapperArgs = [ @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { flac libopusenc libopus - tinyxml-2 + mnxdom kdePackages.qtbase kdePackages.qtdeclarative kdePackages.qt5compat