summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-03-18 18:45:15 +0000
committerOrivej Desh <orivej@gmx.fr>2020-03-18 18:53:09 +0000
commit6245a6b342049aeb9f454ed0eb9923b61de0b286 (patch)
treeb54e5406b81405904ed34c27b766b1d90118dee3
parent3757e02434f4db6318eea3e1d22abe5b0da0ba30 (diff)
downloadnixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar.gz
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar.bz2
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar.lz
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar.xz
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.tar.zst
nixpkgs-6245a6b342049aeb9f454ed0eb9923b61de0b286.zip
musescore: 3.2.3 -> 3.4.2
-rw-r--r--pkgs/applications/audio/musescore/default.nix4
-rw-r--r--pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch16
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 5368fcb6165..7ef6328c02c 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "musescore";
-  version = "3.2.3";
+  version = "3.4.2";
 
   src = fetchzip {
     url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
-    sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs";
+    sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp";
     stripRoot = false;
   };
 
diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
index 53a0c90ce46..57a6092d585 100644
--- a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
+++ b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
@@ -1,12 +1,9 @@
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -660,22 +660,6 @@ if (MINGW)
- else (MINGW)
-
-    if ( NOT MSVC )
--## install qwebengine core
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -220,16 +219,0 @@ else (MINGW)
+-      ## install qwebengine core
 -      if (NOT APPLE AND USE_WEBENGINE)
--         install(FILES
+-         install(PROGRAMS
 -            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
 -            DESTINATION bin
 -            )
@@ -20,6 +17,3 @@
 -            )
 -      endif(NOT APPLE AND USE_WEBENGINE)
 -
-       target_link_libraries(mscore
-          ${ALSA_LIB}
-          ${QT_LIBRARIES}