diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 9b1bf57d2051..8de32103610a 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -1,23 +1,20 @@ { lib, stdenv, - appstream-glib, calf, + cmake, deepfilternet, - desktop-file-utils, fetchFromGitHub, fftw, fftwFloat, - fmt_9, glib, gsl, - gtk4, - itstool, + intltool, + kdePackages, ladspaH, - libadwaita, libbs2b, libebur128, - libportal-gtk4, + libportal-qt6, libsamplerate, libsigcxx30, libsndfile, @@ -25,61 +22,82 @@ lsp-plugins, lv2, mda_lv2, - meson, ninja, nix-update-script, nlohmann_json, pipewire, pkg-config, + qt6, rnnoise, rubberband, soundtouch, speexdsp, onetbb, - wrapGAppsHook4, + webrtc-audio-processing, zam-plugins, zita-convolver, }: let - # Fix crashes with speexdsp effects - speexdsp' = speexdsp.override { withFftw3 = false; }; + inherit (qt6) + qtbase + qtgraphs + qtwebengine + wrapQtAppsHook + ; + inherit (kdePackages) + appstream-qt + breeze-icons + extra-cmake-modules + kcolorscheme + kconfigwidgets + kiconthemes + kirigami + kirigami-addons + qqc2-desktop-style + ; in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.2.5"; + version = "8.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${version}"; - hash = "sha256-w3Mb13LOSF8vgcdJrqbesLqyyilI5AoA19jFquE5lEw="; + hash = "sha256-N1VxA68IzNPZcDodoFTdQ0zpS5hCrHyLjP8Y/bqO/JA="; }; + patches = [ ./qmlmodule-fix.patch ]; + nativeBuildInputs = [ - desktop-file-utils - itstool - meson + cmake + extra-cmake-modules + intltool ninja pkg-config - wrapGAppsHook4 + wrapQtAppsHook ]; buildInputs = [ - appstream-glib + appstream-qt + breeze-icons deepfilternet fftw fftwFloat - fmt_9 glib gsl - gtk4 + kcolorscheme + kconfigwidgets + kiconthemes + kirigami + kirigami-addons ladspaH - libadwaita + qqc2-desktop-style libbs2b libebur128 - libportal-gtk4 + libportal-qt6 libsamplerate libsigcxx30 libsndfile @@ -87,11 +105,15 @@ stdenv.mkDerivation rec { lv2 nlohmann_json pipewire + qtbase + qtgraphs + qtwebengine rnnoise rubberband soundtouch - speexdsp' + speexdsp onetbb + webrtc-audio-processing zita-convolver ]; @@ -110,7 +132,7 @@ stdenv.mkDerivation rec { ]; in '' - gappsWrapperArgs+=( + qtWrapperArgs+=( --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" ) @@ -130,6 +152,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ getchoo aleksana + Gliczy ]; mainProgram = "easyeffects"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch b/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch new file mode 100644 index 000000000000..5ef0be2365fa --- /dev/null +++ b/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2736ac18b..85be09a90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS + QQC2DesktopStyle + ) + +-ecm_find_qmlmodule(org.kde.kirigami REQUIRED) ++ecm_find_qmlmodule(org.kde.kirigami) + + qt_policy(SET QTP0001 NEW)