git.iko.soy/typeable/nixpkgs
on master help sign in
musescore: switch to QtWebEngine
fc2a653Dmitry Kalinkin
pkgs/applications/audio/musescore/default.nix+6−2
@@ -1,7 +1,7 @@
1{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
1{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
2, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
2, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
3, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
3, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
4−, qtwebkit, qtxmlpatterns
4+, qtwebengine, qtxmlpatterns
5}:
5}:
6
6
7stdenv.mkDerivation rec {
7stdenv.mkDerivation rec {
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
15 sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
15 sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
16 };
16 };
17
17
18+ patches = [
19+ ./remove_qtwebengine_install_hack.patch
20+ ];
21+
18 cmakeFlags = [
22 cmakeFlags = [
19 ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
23 ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
20
24
@@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
23 buildInputs = [
27 buildInputs = [
24 alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
28 alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
25 portaudio portmidi # tesseract
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 meta = with stdenv.lib; {
33 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}