diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index 2046233fcb46..fc7b636e97af 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -1,25 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config , help2man -, qmake -, alsa-lib , libjack2 , dbus -, qtbase -, qttools -, qtx11extras +, qt6 , meson , python3 , rtaudio , ninja -, qtquickcontrols2 -, qtnetworkauth -, qtwebsockets -, qtgraphicaleffects }: -mkDerivation rec { - version = "1.10.1"; +stdenv.mkDerivation rec { + version = "2.2.2"; pname = "jacktrip"; src = fetchFromGitHub { @@ -27,7 +19,7 @@ mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bdYhyLsdL4LDkCzJiWXdi+7CTtqhSiA7HNYhg190NWs="; + sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE="; }; preConfigure = '' @@ -36,8 +28,8 @@ mkDerivation rec { buildInputs = [ rtaudio - qtbase - qtx11extras + qt6.qtbase + qt6.qtwayland libjack2 dbus ]; @@ -49,12 +41,13 @@ mkDerivation rec { ninja help2man meson - qmake - qttools - qtquickcontrols2 - qtnetworkauth - qtwebsockets - qtgraphicaleffects + qt6.qt5compat + qt6.qtnetworkauth + qt6.qtwebsockets + qt6.qtwebengine + qt6.qtdeclarative + qt6.qtsvg + qt6.wrapQtAppsHook pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ece348a9304..326b42c16f21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40145,7 +40145,7 @@ with pkgs; jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; jack_autoconnect = jack-autoconnect; - jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { }; + jacktrip = callPackage ../applications/audio/jacktrip { }; j2cli = with python3Packages; toPythonApplication j2cli;