From 62792026d8b0812da03459aadc5b4163d23e9371 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 12 Jun 2026 09:48:49 +0300
Subject: [PATCH 1/2] musescore: simplify qt6.qtdeclarative override

No more need for overriding kdePackages like that since the only
packages used are qt6 anyway.
---
 pkgs/by-name/mu/musescore/package.nix | 51 ++++++---------------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index 8bf887c07d20..ad09d9d02c23 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -16,7 +16,7 @@
   ffmpeg,
   flac,
   freetype,
-  kdePackages,
+  qt6,
   lame,
   libjack2,
   libogg,
@@ -36,36 +36,7 @@
 }:
 
 let
-  # TODO(@doronbehar): Contribute this one day to lib/? See:
-  # https://discourse.nixos.org/t/rfc-nix-function-that-overrides-a-scope-with-automatic-inheritance-propagation/78025
-  overrideScopeFully =
-    s: scopeOverrideFunc:
-    let
-      partiallyOverriddenScope = s.overrideScope scopeOverrideFunc;
-      directlyOverriddenAttrs = builtins.attrNames (scopeOverrideFunc partiallyOverriddenScope s);
-    in
-    builtins.mapAttrs (
-      attrName: pkg:
-      pkg.override (
-        lib.pipe directlyOverriddenAttrs [
-          (builtins.filter (
-            oAttr:
-            # Don't include in this filter the attribute `attrName` from the
-            # full scope, if it is already part of the _directly_ overridden
-            # attributes.
-            !(builtins.elem attrName directlyOverriddenAttrs)
-            && pkg ? override
-            # Continue with the creation of the `.override` arguments only for
-            # overridden attributes (`oAttr`) which are possible arguments to the
-            # `.override` function of the `pkg` at hand.
-            && pkg.override.__functionArgs ? ${oAttr}
-          ))
-          # Generate the `.override` argument using the attribute names `aNames`
-          (aNames: lib.genAttrs aNames (oAttr: partiallyOverriddenScope.${oAttr}))
-        ]
-      )
-    ) partiallyOverriddenScope;
-  kdePackages' = overrideScopeFully kdePackages (
+  qt6' = qt6.overrideScope (
     self: super: {
       # Fix for: https://github.com/NixOS/nixpkgs/issues/526825
       # reported upstream at: https://github.com/musescore/MuseScore/issues/33015
@@ -143,8 +114,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    kdePackages'.qttools
-    kdePackages'.wrapQtAppsHook
+    qt6'.qttools
+    qt6'.wrapQtAppsHook
     ninja
     pkg-config
   ]
@@ -157,12 +128,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     flac
     freetype
-    kdePackages'.qt5compat
-    kdePackages'.qtbase
-    kdePackages'.qtdeclarative
-    kdePackages'.qtnetworkauth
-    kdePackages'.qtscxml
-    kdePackages'.qtsvg
+    qt6'.qt5compat
+    qt6'.qtbase
+    qt6'.qtdeclarative
+    qt6'.qtnetworkauth
+    qt6'.qtscxml
+    qt6'.qtsvg
     lame
     libjack2
     libogg
@@ -179,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    kdePackages'.qtwayland
+    qt6'.qtwayland
   ];
 
   # Put the default, `$prefix/lib` directory to look for ffmpeg shared objects,

From ad4fffd4f9d6d9e9bff11ba1567baeb228be97c6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 12 Jun 2026 09:51:02 +0300
Subject: [PATCH 2/2] musescore: 4.7.2 -> 4.7.3

Diff: https://github.com/musescore/MuseScore/compare/v4.7.2...v4.7.3
---
 pkgs/by-name/mu/musescore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index ad09d9d02c23..c974b2e79415 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -55,13 +55,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.7.2";
+  version = "4.7.3";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7oA+cC5/nOEM2zpFgM13zlBIoc3AB//Ovc+dU1c1r6M=";
+    hash = "sha256-wWqFJkXLRi3JtnEW3STTG/jBBIQK1dIYPZdKCiBn0m0=";
   };
 
   cmakeFlags = [