tjh.dev
Merge pull request #52835 from suhr/musescore
musescore: 2.3.2 -> 3.0
authored by
Dmitry Kalinkin
and committed by
GitHub
fb185ff8
678dda92
+8
-4
pkgs/applications/audio/musescore/default.nix
+8
-4
pkgs/applications/audio/musescore/default.nix
···
1
1
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
2
2
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
3
3
, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
4
-
, qtwebkit, qtxmlpatterns
4
+
, qtwebengine, qtxmlpatterns
5
5
}:
6
6
7
7
stdenv.mkDerivation rec {
8
8
name = "musescore-${version}";
9
-
version = "2.3.2";
9
+
version = "3.0";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "musescore";
13
13
repo = "MuseScore";
14
14
rev = "v${version}";
15
-
sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
15
+
sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
16
16
};
17
17
18
+
patches = [
19
+
./remove_qtwebengine_install_hack.patch
20
+
];
21
+
18
22
cmakeFlags = [
19
23
] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
20
24
···
23
27
buildInputs = [
24
28
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
25
29
portaudio portmidi # tesseract
26
-
qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
30
+
qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
27
31
];
28
32
29
33
meta = with stdenv.lib; {
+25
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
+25
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
···
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}