talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

gqrx: move to by-name, remove with lib (#420317)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2025-06-27 08:13:08 +02:00 committed by GitHub
commit 6d3eb42973
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/radio/gqrx/default.nix → pkgs/by-name/gq/gqrx/package.nix
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
@ -92,7 +89,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
qtWrapperArgs+=("''${gappsWrapperArgs[@]}") qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
meta = with lib; { meta = {
description = "Software defined radio (SDR) receiver"; description = "Software defined radio (SDR) receiver";
mainProgram = "gqrx"; mainProgram = "gqrx";
longDescription = '' longDescription = ''
@ -104,9 +101,9 @@ gnuradioMinimal.pkgs.mkDerivation rec {
homepage = "https://gqrx.dk/"; homepage = "https://gqrx.dk/";
# Some of the code comes from the Cutesdr project, with a BSD license, but # Some of the code comes from the Cutesdr project, with a BSD license, but
# it's currently unknown which version of the BSD license that is. # it's currently unknown which version of the BSD license that is.
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
bjornfor bjornfor
fpletz fpletz
]; ];

5
pkgs/top-level/all-packages.nix
View File

@ -12218,12 +12218,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;
}; };