colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uhd: build with utils by default

Browse Source 
Build the uhd package with utils enabled by default, and disallow it to
retain python references if these features are disabled. Add a new
package uhdMinimal which does not build with these features. Modify the
gnuradio{,3_{8,9}}Minimal packages so that they use the uhd package
without python references.
This commit is contained in:
Doron Behar 2023-10-07 13:13:21 +03:00
parent bae9a9cc4e
commit 2c9957e42f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/radio/uhd/default.nix
View File

@ -18,7 +18,7 @@
, python3
, buildPackages
, enableExamples ? false
, enableUtils ? false
, enableUtils ? true
, libusb1
# Disable dpdk for now due to compilation issues.
, enableDpdk ? false
@ -150,6 +150,10 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/
'';
disallowedReferences = optionals (!enablePythonApi && !enableUtils) [
python3
];
meta = with lib; {
description = "USRP Hardware Driver (for Software Defined Radio)";
longDescription = ''

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

@ -20509,6 +20509,10 @@ with pkgs;
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
uhd = callPackage ../applications/radio/uhd { };
uhdMinimal = uhd.override {
enableUtils = false;
enablePythonApi = false;
};
uisp = callPackage ../development/embedded/uisp { };
@ -31843,6 +31847,7 @@ with pkgs;
# So it will not reference python
enableModTool = false;
};
uhd = uhdMinimal;
features = {
gnuradio-companion = false;
python-support = false;
@ -31875,6 +31880,7 @@ with pkgs;
# So it will not reference python
enableModTool = false;
};
uhd = uhdMinimal;
features = {
gnuradio-companion = false;
python-support = false;
@ -31906,6 +31912,7 @@ with pkgs;
volk = volk.override {
enableModTool = false;
};
uhd = uhdMinimal;
features = {
gnuradio-companion = false;
python-support = false;