From 2b60846510004bff2aa193eee441956f97a336bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 5 Sep 2024 23:03:34 +0300 Subject: [PATCH 1/3] musescore: 4.4.0 -> 4.4.1 Diff: https://github.com/musescore/MuseScore/compare/v4.4.0...v4.4.1 --- pkgs/applications/audio/musescore/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index b90cb2da303e..e87619a88607 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -49,27 +49,15 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-oDbOaLFmSpZ7D8E7LBxUwFwiaPcucIUj3eEp6sXR5o8="; + sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM="; }; patches = [ - # https://github.com/musescore/MuseScore/pull/24247 - (fetchpatch { - name = "skip-downloading-harfbuzz.patch"; - url = "https://github.com/musescore/MuseScore/commit/686ea243d58b43eb3dff7ebdabb2e09de4d212e4.patch"; - hash = "sha256-fsb1hKFKXwBdMPh+Ek0UT3XtI8qg3ieWUQW1/XDvhmg="; - }) - # https://github.com/musescore/MuseScore/pull/24261 - (fetchpatch { - name = "allow-using-system-harfbuzz.patch"; - url = "https://github.com/musescore/MuseScore/commit/696279e362afe72db5e92f8a47aa64b3a0e86a86.patch"; - hash = "sha256-z1W2SmzUUlVL7mRR2frzUZjMEnwqkVfRVz4TufR1tDU="; - }) # https://github.com/musescore/MuseScore/pull/24326 (fetchpatch { name = "fix-menubar-with-qt6.5+.patch"; From e4e48d0b7ce20baa319a2a974335aa514df7a1de Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 6 Sep 2024 12:05:34 +0300 Subject: [PATCH 2/3] musescore: add qtwayland only on Linux - where it is supported --- pkgs/applications/audio/musescore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index e87619a88607..c5a17ba57061 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -120,12 +120,12 @@ in stdenv'.mkDerivation (finalAttrs: { qtbase qtdeclarative qt5compat - qtwayland qtsvg qtscxml qtnetworkauth ] ++ lib.optionals stdenv.isLinux [ alsa-lib + qtwayland ]; postInstall = '' From e078384da51ae22a52d65f55759a8db4f0c3baaa Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Sep 2024 01:13:28 +0300 Subject: [PATCH 3/3] musescore: fix Darwin build --- pkgs/applications/audio/musescore/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index c5a17ba57061..fbfc50a1a684 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -126,6 +126,8 @@ in stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isLinux [ alsa-lib qtwayland + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa ]; postInstall = ''