dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

musescore: switch to QtWebEngine

Browse Source 
Since version 3.0 it builds with QtWebEngine by default.
This commit is contained in:
Dmitry Kalinkin 2019-01-04 19:43:23 -05:00
parent b3e56b0533
commit fc2a65308f
No known key found for this signature in database
GPG Key ID: 06AF1D3C38F04E0E
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/audio/musescore/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig { stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
, qtwebkit, qtxmlpatterns , qtwebengine, qtxmlpatterns
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50"; sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
}; };
patches = [
./remove_qtwebengine_install_hack.patch
];
cmakeFlags = [ cmakeFlags = [
] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio portmidi # tesseract portaudio portmidi # tesseract
qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

25
pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch Normal file
View File

@ -0,0 +1,25 @@
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@@ -660,22 +660,6 @@ if (MINGW)
else (MINGW)
if ( NOT MSVC )
-## install qwebengine core
- if (NOT APPLE AND USE_WEBENGINE)
- install(FILES
- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
- DESTINATION bin
- )
- install(DIRECTORY
- ${QT_INSTALL_DATA}/resources
- DESTINATION lib/qt5
- )
- install(DIRECTORY
- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
- DESTINATION lib/qt5/translations
- )
- endif(NOT APPLE AND USE_WEBENGINE)
-
target_link_libraries(mscore
${ALSA_LIB}
${QT_LIBRARIES}