From b090f3d52691a4c2adc97bb8cf00b1d5c08b9d1b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 20 Jan 2026 13:19:32 +0200 Subject: [PATCH] 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. --- pkgs/applications/radio/gnuradio/default.nix | 35 ++++++++------------ 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 96962f914f7a..9c4d8cdbf427 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -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