From 21796dd79f5aca770bde0fd4d0d7400ace6a2f87 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 May 2026 08:53:48 +0300 Subject: [PATCH 1/5] musescore: remove unused fetchpatch argument --- pkgs/by-name/mu/musescore/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 225878b43fea..5c8704b3305c 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, wrapGAppsHook3, pkg-config, From 45efd52bb9a7464306212f5b6e8aefec07109f94 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 May 2026 20:23:08 +0300 Subject: [PATCH 2/5] musescore: remove lame from inputs Not really used, but should be brought back once https://github.com/musescore/MuseScore/pull/32391 is released. See also https://github.com/musescore/MuseScore/issues/11572#issuecomment-4474931672 --- pkgs/by-name/mu/musescore/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 5c8704b3305c..089ca7242f11 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -10,7 +10,6 @@ alsa-plugins, freetype, libjack2, - lame, libogg, libpulseaudio, libsndfile, @@ -93,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libjack2 freetype - lame libogg libpulseaudio libsndfile From 831256aedb87c2fed924b52daca19ea07445f1bb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 May 2026 09:08:49 +0300 Subject: [PATCH 3/5] musescore: categorize arguments --- pkgs/by-name/mu/musescore/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 089ca7242f11..c40e3bf26764 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -1,11 +1,15 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, + + # nativeBuildInputs cmake, wrapGAppsHook3, pkg-config, ninja, + + # buildInputs alsa-lib, alsa-plugins, freetype, @@ -21,6 +25,8 @@ libopus, tinyxml-2, kdePackages, + + # passthru tests nixosTests, }: From 66ef9478e295a2bbb6a4379f40c6b599f519c18d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 May 2026 09:09:30 +0300 Subject: [PATCH 4/5] musescore: use lib.cmake{Bool,Feature} in cmakeFlags --- pkgs/by-name/mu/musescore/package.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index c40e3bf26764..4fbcb1a900e1 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -42,23 +42,26 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ - "-DMUSE_APP_BUILD_MODE=release" + (lib.cmakeFeature "MUSE_APP_BUILD_MODE" "release") # Disable the build and usage of the `/bin/crashpad_handler` utility - it's # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 - "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" - # Use our versions of system libraries - "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" - "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=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" + (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. - "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" + (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) + ] + # Use our versions of system libraries, see: + # https://github.com/musescore/MuseScore/issues/11572 + ++ map (l: lib.cmakeBool "MUE_COMPILE_USE_SYSTEM_${l}" true) [ + "FREETYPE" + "HARFBUZZ" + "TINYXML" + # Implies also OPUS + "OPUSENC" + "FLAC" ]; qtWrapperArgs = [ From f9b018d3386177200af2efbebdf015c1a4f777a3 Mon Sep 17 00:00:00 2001 From: Notarin Steele <424c414e4b@gmail.com> Date: Fri, 15 May 2026 23:32:39 -0400 Subject: [PATCH 5/5] =?UTF-8?q?musescore:=204.6.5=20=E2=86=92=204.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves #520298 Diff: https://github.com/musescore/MuseScore/compare/v4.6.5...v4.7.0 Co-Authored-By: Doron Behar --- pkgs/by-name/mu/musescore/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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