gqrx: move to by-name

This commit is contained in:
awwpotato 2025-06-26 11:57:03 -07:00
parent 24d9d8b1fc
commit a10bca57bb
No known key found for this signature in database
2 changed files with 7 additions and 11 deletions

View File

@ -4,9 +4,7 @@
cmake, cmake,
desktopToDarwinBundle, desktopToDarwinBundle,
pkg-config, pkg-config,
qtbase, qt6Packages,
qtsvg,
qtwayland,
gnuradioMinimal, gnuradioMinimal,
thrift, thrift,
mpir, mpir,
@ -14,7 +12,6 @@
alsa-lib, alsa-lib,
libjack2, libjack2,
wrapGAppsHook3, wrapGAppsHook3,
wrapQtAppsHook,
# drivers (optional): # drivers (optional):
rtl-sdr, rtl-sdr,
hackrf, hackrf,
@ -44,7 +41,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
wrapQtAppsHook qt6Packages.wrapQtAppsHook
wrapGAppsHook3 wrapGAppsHook3
] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
@ -55,15 +52,15 @@ gnuradioMinimal.pkgs.mkDerivation rec {
fftwFloat fftwFloat
libjack2 libjack2
gnuradioMinimal.unwrapped.boost gnuradioMinimal.unwrapped.boost
qtbase qt6Packages.qtbase
qtsvg qt6Packages.qtsvg
gnuradioMinimal.pkgs.osmosdr gnuradioMinimal.pkgs.osmosdr
rtl-sdr rtl-sdr
hackrf hackrf
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib alsa-lib
qtwayland qt6Packages.qtwayland
] ]
++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [ ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
thrift thrift

View File

@ -12222,12 +12222,11 @@ with pkgs;
inherit (ocamlPackages) google-drive-ocamlfuse; inherit (ocamlPackages) google-drive-ocamlfuse;
gqrx = qt6Packages.callPackage ../applications/radio/gqrx { }; gqrx-portaudio = gqrx.override {
gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx {
portaudioSupport = true; portaudioSupport = true;
pulseaudioSupport = false; pulseaudioSupport = false;
}; };
gqrx-gr-audio = qt6Packages.callPackage ../applications/radio/gqrx { gqrx-gr-audio = gqrx.override {
portaudioSupport = false; portaudioSupport = false;
pulseaudioSupport = false; pulseaudioSupport = false;
}; };