diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8dcc9ca65d45..2ccc2c73771f 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -2,7 +2,9 @@ , fetchFromGitHub , cmake , pkg-config -, qt5 +, qtbase +, qtsvg +, qtwayland , gnuradio3_8Minimal , thrift , mpir @@ -10,6 +12,7 @@ , alsa-lib , libjack2 , wrapGAppsHook +, wrapQtAppsHook # drivers (optional): , rtl-sdr , hackrf @@ -30,13 +33,13 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; + hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ cmake pkg-config - qt5.wrapQtAppsHook + wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ @@ -46,8 +49,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { alsa-lib libjack2 gnuradio3_8Minimal.unwrapped.boost - qt5.qtbase - qt5.qtsvg + qtbase + qtsvg + qtwayland gnuradio3_8Minimal.pkgs.osmosdr rtl-sdr hackrf diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8aebe9618cd4..dc7df5a6fd45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29019,12 +29019,12 @@ with pkgs; gpx = callPackage ../applications/misc/gpx { }; - gqrx = callPackage ../applications/radio/gqrx { }; - gqrx-portaudio = callPackage ../applications/radio/gqrx { + gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; + gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx { portaudioSupport = true; pulseaudioSupport = false; }; - gqrx-gr-audio = callPackage ../applications/radio/gqrx { + gqrx-gr-audio = qt6Packages.callPackage ../applications/radio/gqrx { portaudioSupport = false; pulseaudioSupport = false; };