From b7199d242e645d8ea41bd991cc17a7021fcf5a40 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 26 Nov 2021 09:38:06 +0200 Subject: [PATCH] musescore: Fix some qt issues - Force use QT_QPA_PLATFORM=xcb since setting it to `wayland` causes some GUI issues. - Use qt515 - There are no issues with it at least now (it was set to qt514 in commit c3cd2be2e2f504a0e054275b705bd09c39e3038a). - Don't disable QML cache since it's been a long time since the update from 3.4.2 to 3.5.0 of musescore. - Add @doronbehar as maintainer. --- pkgs/applications/audio/musescore/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 4b784272c35b..7662eadc4983 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -29,9 +29,9 @@ mkDerivation rec { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" - # Work around crash on update from 3.4.2 to 3.5.0 - # https://bugreports.qt.io/browse/QTBUG-85967 - "--set QML_DISABLE_DISK_CACHE 1" + # There are some issues with using the wayland backend, see: + # https://musescore.org/en/node/321936 + "--set QT_QPA_PLATFORM xcb" ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -49,7 +49,7 @@ mkDerivation rec { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ vandenoever turion ]; + maintainers = with maintainers; [ vandenoever turion doronbehar ]; platforms = platforms.linux; repositories.git = "https://github.com/musescore/MuseScore"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a9d7517defe..89601cd2661d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27023,7 +27023,7 @@ with pkgs; if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt514.callPackage ../applications/audio/musescore { }; + libsForQt5.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { };