forked from mirrors/nixpkgs
gnuradio: disabledForGRafter -> disabled
This commit is contained in:
parent
68330abc1b
commit
d075c6f0b1
|
@ -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") {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -24,6 +24,7 @@ let
|
|||
;
|
||||
inherit mkDerivationWith mkDerivation;
|
||||
inherit gnuradio;
|
||||
inherit (gnuradio) gnuradioOlder gnuradioAtLeast;
|
||||
} // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") {
|
||||
inherit (gnuradio) uhd;
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue