git.iko.soy/typeable/nixpkgs
on master help sign in
musescore: switch to QtWebEngine

Since version 3.0 it builds with QtWebEngine by default.

commitfc2a65308f751da93a085626a2e188b9bdc9a007 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateFri 4 Jan 2019, 19:43 (8 years ago) parentb3e56b0
2 files changed+31−2
pkgs/applications/audio/musescore/default.nix+6−2 pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch+25
pkgs/applications/audio/musescore/default.nix+6−2
@@ -1,7 +1,7 @@
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 {
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
1515 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}