gnuradio: (passthru) always inherit not necessarily used deps
Shouldn't break anything, and helps referring to gnuradio.passthru.uhd when it might be marked as broken on that the current platform.
This commit is contained in:
@@ -310,27 +310,20 @@ stdenv.mkDerivation (
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
];
|
||||
passthru =
|
||||
shared.passthru
|
||||
// {
|
||||
# Deps that are potentially overridden and are used inside GR plugins - the same version must
|
||||
inherit
|
||||
boost
|
||||
volk
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# previous gnuradio versions where there it's log4cpp.
|
||||
logLib = spdlog;
|
||||
}
|
||||
// lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
}
|
||||
// lib.optionalAttrs (hasFeature "gr-pdu") {
|
||||
inherit libiio libad9361;
|
||||
}
|
||||
// lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
inherit (libsForQt5) qwt;
|
||||
};
|
||||
passthru = shared.passthru // {
|
||||
# Deps that are potentially overridden and are used inside GR plugins - the same version must
|
||||
inherit
|
||||
uhd
|
||||
boost
|
||||
volk
|
||||
libiio
|
||||
libad9361
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# previous gnuradio versions where there it's log4cpp.
|
||||
logLib = spdlog;
|
||||
inherit (libsForQt5) qwt;
|
||||
};
|
||||
|
||||
postInstall =
|
||||
shared.postInstall
|
||||
|
||||
Reference in New Issue
Block a user