diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-04 20:20:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 20:20:34 -0500 |
| commit | fb185ff8591f02ec85be693d1589ff6da9067aec (patch) | |
| tree | f4c9c43302620e55e29faf04b9f531e8360e48e3 /pkgs | |
| parent | 678dda92a5d8a9d90fa5cff24d4afaf6c6072633 (diff) | |
| parent | fc2a65308f751da93a085626a2e188b9bdc9a007 (diff) | |
| download | nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar.gz nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar.bz2 nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar.lz nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar.xz nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.tar.zst nixpkgs-fb185ff8591f02ec85be693d1589ff6da9067aec.zip | |
Merge pull request #52835 from suhr/musescore
musescore: 2.3.2 -> 3.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/musescore/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch | 25 |
2 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 28381fcfee6..340978c8183 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,20 +1,24 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis , portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools -, qtwebkit, qtxmlpatterns +, qtwebengine, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.3.2"; + version = "3.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1"; + sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50"; }; + patches = [ + ./remove_qtwebengine_install_hack.patch + ]; + cmakeFlags = [ ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract - qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns + qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch new file mode 100644 index 00000000000..53a0c90ce46 --- /dev/null +++ b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch @@ -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} |