diff options
Diffstat (limited to 'pkgs/applications/audio/musescore/default.nix')
-rw-r--r-- | pkgs/applications/audio/musescore/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 707ec5c8ebfe8..479e8850872c5 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -20,6 +20,9 @@ , qtdeclarative , qtgraphicaleffects , flac +, libopusenc +, libopus +, tinyxml-2 , qtquickcontrols , qtquickcontrols2 , qtscript @@ -47,13 +50,13 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.2.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-YCeO/ijxA+tZxNviqmlIBkAdjPTrKoOoo1QyMIOqhWU="; + sha256 = "sha256-QjvY8R2nq/DeFDikHn9qr4aCEwzAcogQXM5vdZqhoMM="; }; cmakeFlags = [ @@ -62,8 +65,12 @@ in stdenv'.mkDerivation (finalAttrs: { # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 "-DMUE_BUILD_CRASHPAD_CLIENT=OFF" - # Use our freetype + # Use our versions of system libraries "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" + "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" + # Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON + "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" + "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake, # upstream defaults to compiling to x86_64 only, unless this cmake flag is # set @@ -84,11 +91,6 @@ in stdenv'.mkDerivation (finalAttrs: { "--set-default QT_QPA_PLATFORM xcb" ]; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the - # sandbox profile from `qtbase`, see: - # https://github.com/NixOS/nixpkgs/issues/237458 - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; - nativeBuildInputs = [ wrapQtAppsHook cmake @@ -107,6 +109,9 @@ in stdenv'.mkDerivation (finalAttrs: { portaudio' portmidi flac + libopusenc + libopus + tinyxml-2 qtbase qtdeclarative qtgraphicaleffects |