From 1349ad7e63fc2a9693b0eeea3615e66cd007b973 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 3 Oct 2025 21:53:41 +0400 Subject: [PATCH] sdr-j-fm: migrate to by-name --- .../default.nix => by-name/sd/sdr-j-fm/package.nix} | 11 +++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) rename pkgs/{applications/radio/sdr-j-fm/default.nix => by-name/sd/sdr-j-fm/package.nix} (95%) diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/by-name/sd/sdr-j-fm/package.nix similarity index 95% rename from pkgs/applications/radio/sdr-j-fm/default.nix rename to pkgs/by-name/sd/sdr-j-fm/package.nix index b970a59139d4..7e9d44689810 100644 --- a/pkgs/applications/radio/sdr-j-fm/default.nix +++ b/pkgs/by-name/sd/sdr-j-fm/package.nix @@ -3,10 +3,9 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, pkg-config, - qtbase, - qwt6_1, + qt5, + libsForQt5, fftwFloat, libsamplerate, portaudio, @@ -31,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook pkg-config ]; buildInputs = [ - qtbase - qwt6_1 + qt5.qtbase + libsForQt5.qwt6_1 fftwFloat libsamplerate portaudio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cf07ca6e30b..e0a248860b08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8705,8 +8705,6 @@ with pkgs; SDL = SDL_compat; SDL2 = sdl2-compat; - sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; - sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;