From 52dfdc5e51838b2b1a85831fb7823e71b4a6c83b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 26 May 2026 17:07:13 +0300 Subject: [PATCH 1/2] musescore: sort inputs --- pkgs/by-name/mu/musescore/package.nix | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 367fc7cedc99..a689240bf375 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -5,26 +5,26 @@ # nativeBuildInputs cmake, - wrapGAppsHook3, - pkg-config, ninja, + pkg-config, + wrapGAppsHook3, # buildInputs alsa-lib, alsa-plugins, + flac, freetype, + kdePackages, libjack2, libogg, + libopus, + libopusenc, libpulseaudio, libsndfile, libvorbis, + mnxdom, portaudio, portmidi, - flac, - libopusenc, - libopus, - mnxdom, - kdePackages, # passthru tests nixosTests, @@ -87,11 +87,11 @@ stdenv.mkDerivation (finalAttrs: { dontWrapGApps = true; nativeBuildInputs = [ - kdePackages.wrapQtAppsHook cmake kdePackages.qttools - pkg-config + kdePackages.wrapQtAppsHook ninja + pkg-config ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998 @@ -100,24 +100,24 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libjack2 + flac freetype + kdePackages.qt5compat + kdePackages.qtbase + kdePackages.qtdeclarative + kdePackages.qtnetworkauth + kdePackages.qtscxml + kdePackages.qtsvg + libjack2 libogg + libopus + libopusenc libpulseaudio libsndfile libvorbis + mnxdom portaudio portmidi - flac - libopusenc - libopus - mnxdom - kdePackages.qtbase - kdePackages.qtdeclarative - kdePackages.qt5compat - kdePackages.qtsvg - kdePackages.qtscxml - kdePackages.qtnetworkauth ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib From 4772e10d2371b5a681a926a3792f69ba7d3c6fa6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 26 May 2026 17:02:38 +0300 Subject: [PATCH 2/2] musescore: 4.7.0 -> 4.7.2 Diff: https://github.com/musescore/MuseScore/compare/v4.7.0...v4.7.2 --- pkgs/by-name/mu/musescore/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index a689240bf375..80d57dbef7e7 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -15,6 +15,7 @@ flac, freetype, kdePackages, + lame, libjack2, libogg, libopus, @@ -25,6 +26,8 @@ mnxdom, portaudio, portmidi, + pugixml, + utf8cpp, # passthru tests nixosTests, @@ -32,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.7.0"; + version = "4.7.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; tag = "v${finalAttrs.version}"; - hash = "sha256-AEYZWkcjqB2pW+oBow2oMX1HQn4kRaTBBxhyxIbG0a4="; + hash = "sha256-7oA+cC5/nOEM2zpFgM13zlBIoc3AB//Ovc+dU1c1r6M="; }; cmakeFlags = [ @@ -59,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: { # Implies also OPUS "OPUSENC" "FLAC" + "PUGIXML" + "LAME" + "UTF8CPP" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/musescore/MuseScore/issues/33467 @@ -108,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.qtnetworkauth kdePackages.qtscxml kdePackages.qtsvg + lame libjack2 libogg libopus @@ -118,6 +125,8 @@ stdenv.mkDerivation (finalAttrs: { mnxdom portaudio portmidi + pugixml + utf8cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib