swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnuradio: disabledForGRafter -> disabled

Browse source
This commit is contained in:
Chuang Zhu 2024-01-17 06:19:41 +08:00
parent 68330abc1b
commit d075c6f0b1
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/radio/gnuradio/shared.nix
View file

@ -104,6 +104,8 @@ in {
featuresInfo
python
;
gnuradioOlder = lib.versionOlder versionAttr.major;
gnuradioAtLeast = lib.versionAtLeast versionAttr.major;
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
inherit qt;
} // lib.optionalAttrs (hasFeature "gnuradio-companion") {

10
pkgs/development/gnuradio-modules/mkDerivation.nix
View file

@ -7,12 +7,18 @@ mkDerivation:
args:
# Check if it's supposed to not get built for the current gnuradio version
if (builtins.hasAttr "disabledForGRafter" args) &&
(lib.versionAtLeast unwrapped.versionAttr.major args.disabledForGRafter) then
if (builtins.hasAttr "disabled" args) && args.disabled then
let name = args.name or "${args.pname}"; in
throw "Package ${name} is incompatible with GNURadio ${unwrapped.versionAttr.major}"
else
if builtins.hasAttr "disabledForGRafter" args then
throw ''
`disabledForGRafter` is superseded by `disabled`.
Use `disabled = gnuradioAtLeast "${unwrapped.versionAttr.major}";` instead.
''
else
let
args_ = {
enableParallelBuilding = args.enableParallelBuilding or true;

1
pkgs/top-level/gnuradio-packages.nix
View file

@ -24,6 +24,7 @@ let
;
inherit mkDerivationWith mkDerivation;
inherit gnuradio;
inherit (gnuradio) gnuradioOlder gnuradioAtLeast;
} // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") {
inherit (gnuradio) uhd;
});