git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52835 from suhr/musescore

musescore: 2.3.2 -> 3.0

commitfb185ff8591f02ec85be693d1589ff6da9067aec authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateFri 4 Jan 2019, 20:20 (8 years ago) parent678dda9fc2a653
2 files changed+33−4
pkgs/applications/audio/musescore/default.nix+8−4 pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch+25
pkgs/applications/audio/musescore/default.nix+8−4
@@ -1,20 +1,24 @@
11{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
22, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
33, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
4−, qtwebkit, qtxmlpatterns
4+, qtwebengine, qtxmlpatterns
55}:
66
77stdenv.mkDerivation rec {
88 name = "musescore-${version}";
9− version = "2.3.2";
9+ version = "3.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "musescore";
1313 repo = "MuseScore";
1414 rev = "v${version}";
15− sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
15+ sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
1616 };
1717
18+ patches = [
19+ ./remove_qtwebengine_install_hack.patch
20+ ];
21+
1822 cmakeFlags = [
1923 ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
2024
@@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
2327 buildInputs = [
2428 alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
2529 portaudio portmidi # tesseract
26− qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
30+ qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
2731 ];
2832
2933 meta = with stdenv.lib; {
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patchnew file+25
@@ -0,0 +1,25 @@
1+--- a/mscore/CMakeLists.txt
2++++ b/mscore/CMakeLists.txt
3+@@ -660,22 +660,6 @@ if (MINGW)
4+ else (MINGW)
5+
6+ if ( NOT MSVC )
7+-## install qwebengine core
8+- if (NOT APPLE AND USE_WEBENGINE)
9+- install(FILES
10+- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
11+- DESTINATION bin
12+- )
13+- install(DIRECTORY
14+- ${QT_INSTALL_DATA}/resources
15+- DESTINATION lib/qt5
16+- )
17+- install(DIRECTORY
18+- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
19+- DESTINATION lib/qt5/translations
20+- )
21+- endif(NOT APPLE AND USE_WEBENGINE)
22+-
23+ target_link_libraries(mscore
24+ ${ALSA_LIB}
25+ ${QT_LIBRARIES}