diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 01940bfc4f32..fb80c10f046f 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,33 +1,68 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook -, alsa-lib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo -, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord, serd +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, alsa-lib +, dssi +, fluidsynth +, ladspaH +, lash +, libinstpatch +, libjack2 +, liblo +, libsamplerate +, libsndfile +, lilv +, lrdf +, lv2 +, qtsvg +, rtaudio +, rubberband +, sord +, serd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "muse-sequencer"; - version = "3.1.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; - rev = "muse_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; + rev = finalAttrs.version; + hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY="; }; - sourceRoot = "${src.name}/muse3"; - - patches = [ ./fix-parallel-building.patch ]; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ - alsa-lib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo - libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord + alsa-lib + dssi + fluidsynth + ladspaH + lash + libinstpatch + libjack2 + liblo + libsamplerate + libsndfile + lilv + lrdf + lv2 + qtsvg + rtaudio + rubberband + sord ]; env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev serd}/include/serd-0" ]; - meta = with lib; { + meta = { homepage = "https://muse-sequencer.github.io/"; description = "MIDI/Audio sequencer with recording and editing capabilities"; longDescription = '' @@ -38,7 +73,9 @@ stdenv.mkDerivation rec { MusE aims to be a complete multitrack virtual studio for Linux, it is published under the GNU General Public License. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ eclairevoyant orivej ]; + platforms = lib.platforms.linux; + mainProgram = "muse4"; }; -} +}) diff --git a/pkgs/applications/audio/muse/fix-parallel-building.patch b/pkgs/applications/audio/muse/fix-parallel-building.patch deleted file mode 100644 index a11970b7111a..000000000000 --- a/pkgs/applications/audio/muse/fix-parallel-building.patch +++ /dev/null @@ -1,93 +0,0 @@ -To confirm these dependencies, run in a fresh build tree: - - -ninja muse/components/CMakeFiles/components.dir/confmport.o - -In file included from ../muse/components/confmport.cpp:48: -../muse/mplugins/midifilterimpl.h:28:10: fatal error: -ui_midifilter.h: No such file or directory - - -ninja muse/waveedit/CMakeFiles/waveedit.dir/wavecanvas.o - -In file included from ../muse/waveedit/wavecanvas.cpp:72: -../muse/components/copy_on_write.h:26:10: fatal error: -ui_copy_on_write_base.h: No such file or directory - - -ninja muse/instruments/CMakeFiles/instruments.dir/editinstrument.o - -In file included from ../muse/instruments/editinstrument.cpp:58: -../muse/components/editevent.h:26:10: fatal error: -ui_editnotedialogbase.h: No such file or directory - - -ninja muse/liste/CMakeFiles/liste.dir/listedit.o - -In file included from ../muse/liste/listedit.cpp:37: -../muse/components/editevent.h:26:10: fatal error: -ui_editnotedialogbase.h: No such file or directory - - -ninja muse/mixer/CMakeFiles/mixer.dir/rack.o - -In file included from ../muse/mixer/rack.cpp:49: -../muse/components/plugindialog.h:4:10: fatal error: -ui_plugindialogbase.h: No such file or directory - - -ninja muse/midiedit/CMakeFiles/midiedit.dir/drumedit.o - -In file included from /build/source/muse3/muse/midiedit/drumedit.cpp:64: -/build/source/muse3/muse/components/filedialog.h:29:10: fatal error: -ui_fdialogbuttons.h: No such file or directory - - ---- a/muse/components/CMakeLists.txt -+++ b/muse/components/CMakeLists.txt -@@ -343,4 +343,5 @@ set_target_properties( components - target_link_libraries ( components - ${QT_LIBRARIES} -+ mplugins - widgets - xml_module ---- a/muse/waveedit/CMakeLists.txt -+++ b/muse/waveedit/CMakeLists.txt -@@ -79,4 +79,5 @@ set_target_properties( waveedit - target_link_libraries( waveedit - ${QT_LIBRARIES} -+ components - widgets - ) ---- a/muse/instruments/CMakeLists.txt -+++ b/muse/instruments/CMakeLists.txt -@@ -78,4 +78,5 @@ set_target_properties( instruments - target_link_libraries ( instruments - ${QT_LIBRARIES} -+ components - icons - widgets ---- a/muse/liste/CMakeLists.txt -+++ b/muse/liste/CMakeLists.txt -@@ -65,4 +65,5 @@ set_target_properties( liste - target_link_libraries ( liste - ${QT_LIBRARIES} -+ components - awl - widgets ---- a/muse/mixer/CMakeLists.txt -+++ b/muse/mixer/CMakeLists.txt -@@ -87,4 +87,5 @@ set_target_properties ( mixer - target_link_libraries ( mixer - ${QT_LIBRARIES} -+ components - widgets - ) ---- a/muse/midiedit/CMakeLists.txt -+++ b/muse/midiedit/CMakeLists.txt -@@ -93,4 +93,5 @@ set_target_properties( midiedit - target_link_libraries ( midiedit - ${QT_LIBRARIES} -+ components - al - ctrl