From 592ebbfbf1b601395294614e826237c41164efcf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Nov 2024 15:30:04 +0200 Subject: [PATCH] gnuradioMinimal: move to pkgs/by-name --- pkgs/by-name/gn/gnuradioMinimal/package.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 26 ----------------- 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 pkgs/by-name/gn/gnuradioMinimal/package.nix diff --git a/pkgs/by-name/gn/gnuradioMinimal/package.nix b/pkgs/by-name/gn/gnuradioMinimal/package.nix new file mode 100644 index 000000000000..7d52dd744c96 --- /dev/null +++ b/pkgs/by-name/gn/gnuradioMinimal/package.nix @@ -0,0 +1,31 @@ +{ + gnuradio, + volk, + uhdMinimal, +}: +# A build without gui components and other utilites not needed for end user +# libraries +gnuradio.override { + doWrap = false; + unwrapped = gnuradio.unwrapped.override { + volk = volk.override { + # So it will not reference python + enableModTool = false; + }; + uhd = uhdMinimal; + features = { + gnuradio-companion = false; + python-support = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + gr-blocktool = false; + sphinx = false; + doxygen = false; + # Doesn't make it reference python eventually, but makes reverse + # depdendencies require python to use cmake files of GR. + gr-ctrlport = false; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c2d0e0c5d0c..e55e7941845d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13641,32 +13641,6 @@ with pkgs; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - # A build without gui components and other utilites not needed for end user - # libraries - gnuradioMinimal = gnuradio.override { - doWrap = false; - unwrapped = gnuradio.unwrapped.override { - volk = volk.override { - # So it will not reference python - enableModTool = false; - }; - uhd = uhdMinimal; - features = { - gnuradio-companion = false; - python-support = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - gr-blocktool = false; - sphinx = false; - doxygen = false; - # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. - gr-ctrlport = false; - }; - }; - }; gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio;