Merge pull request #182898 from mmlb/update-nootka

pkgs/applications/audio/nootka/default.nix

@@ -1,19 +1,30 @@
 { lib, stdenv, fetchurl, cmake
-, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase
+, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
+, qtbase, qtdeclarative, qtgraphicaleffects, qtquickcontrols2, qttools, wrapQtAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "nootka";
-  version = "1.4.7";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
-    sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x";
+    sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
   buildInputs = [
-    alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase
+    alsa-lib
+    fftwSinglePrec
+    libjack2
+    libpulseaudio
+    libvorbis
+    soundtouch
+    qtbase
+    qtdeclarative
+    qtgraphicaleffects
+    qtquickcontrols2
+    qttools
   ];
 
   cmakeFlags = [
@@ -22,13 +33,11 @@ stdenv.mkDerivation rec {
     "-DENABLE_PULSEAUDIO=ON"
   ];
 
-  dontWrapQtApps = true;
-
   meta = with lib; {
     description = "Application for practicing playing musical scores and ear training";
     homepage = "https://nootka.sourceforge.io/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ orivej ];
+    maintainers = with maintainers; [ mmlb orivej ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/audio/nootka/unstable.nix

@@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, alsa-lib
-, fftwSinglePrec
-, libjack2
-, libpulseaudio
-, libvorbis
-, soundtouch
-, qtbase
-, qtdeclarative
-, qtquickcontrols2
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nootka";
-  version = "1.7.0-beta1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2";
-    sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    alsa-lib
-    fftwSinglePrec
-    libjack2
-    libpulseaudio
-    libvorbis
-    soundtouch
-    qtbase
-    qtdeclarative
-    qtquickcontrols2
-  ];
-
-  dontWrapQtApps = true;
-
-  cmakeFlags = [
-    "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
-    "-DENABLE_JACK=ON"
-    "-DENABLE_PULSEAUDIO=ON"
-  ];
-
-  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "Application for practicing playing musical scores and ear training";
-    homepage = "https://nootka.sourceforge.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -30004,7 +30004,6 @@ with pkgs;
   notion = callPackage ../applications/window-managers/notion { };
 
   nootka = qt5.callPackage ../applications/audio/nootka { };
-  nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { };
 
   novnc = callPackage ../applications/networking/novnc { };