diff options
author | Doron Behar <doron.behar@gmail.com> | 2022-02-18 10:13:16 +0200 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2022-02-18 10:53:48 +0200 |
commit | 88519c6309d5d6833b3017168179e412beb781f2 (patch) | |
tree | 08d3e9f888be9b26d9a04ff79943d29d8c989554 /pkgs/top-level/gnuradio-packages.nix | |
parent | c970bece308228489c9432afe1fb7198ac866c31 (diff) |
gnuradio: Inherit log dependencies in passthrus
Inherit spdlog for GR 3.10 and log4cpp for lower GR versions. Inherit both of these in the scope of the GR packages attribute set. Also use the inherited log4cpp in qradiolink, gqrx & gnss-sdr.
Diffstat (limited to 'pkgs/top-level/gnuradio-packages.nix')
-rw-r--r-- | pkgs/top-level/gnuradio-packages.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d291c1e830cda..1cd2c93da773d 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -14,16 +14,20 @@ let }; mkDerivation = mkDerivationWith stdenv.mkDerivation; - callPackage = self.newScope { + callPackage = self.newScope ({ inherit (gnuradio) # Packages that are potentially overriden and used as deps here. boost - uhd volk ; inherit mkDerivationWith mkDerivation; - }; - + } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { + inherit (gnuradio) uhd; + } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { + inherit (gnuradio) spdlog; + } else { + inherit (gnuradio) log4cpp; + })); in { inherit callPackage mkDerivation mkDerivationWith; |