pyrox.dev / nixpkgs
lol
fork atom

gnuradio: Define a common logLib attribute

Use it in all gnuradio modules.

Doron Behar 2634268f 1dd64003

+29 -29
unified split
+2 -5
pkgs/applications/radio/gnss-sdr/default.nix
··· 60 60 pugixml 61 61 protobuf 62 62 gnuradio.unwrapped.boost 63 + gnuradio.unwrapped.logLib 63 64 ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ 64 65 gnuradio.unwrapped.uhd 65 - ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [ 66 - gnuradio.unwrapped.spdlog 67 - ] else [ 68 - gnuradio.unwrapped.log4cpp 69 - ]) ++ lib.optionals (enableRawUdp) [ 66 + ] ++ lib.optionals (enableRawUdp) [ 70 67 libpcap 71 68 ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ 72 69 thrift
+3 -1
pkgs/applications/radio/gnuradio/3.8.nix
··· 253 253 inherit 254 254 boost 255 255 volk 256 - log4cpp 257 256 ; 257 + # Used by many gnuradio modules, the same attribute is present in 258 + # gnuradio3.10 where there it's spdlog. 259 + logLib = log4cpp; 258 260 } // lib.optionalAttrs (hasFeature "gr-uhd") { 259 261 inherit uhd; 260 262 } // lib.optionalAttrs (hasFeature "gr-qtgui") {
+3 -1
pkgs/applications/radio/gnuradio/3.9.nix
··· 285 285 inherit 286 286 boost 287 287 volk 288 - log4cpp 289 288 ; 289 + # Used by many gnuradio modules, the same attribute is present in 290 + # gnuradio3.10 where there it's spdlog. 291 + logLib = log4cpp; 290 292 } // lib.optionalAttrs (hasFeature "gr-uhd") { 291 293 inherit uhd; 292 294 } // lib.optionalAttrs (hasFeature "gr-qtgui") {
+3 -1
pkgs/applications/radio/gnuradio/default.nix
··· 305 305 inherit 306 306 boost 307 307 volk 308 - spdlog 309 308 ; 309 + # Used by many gnuradio modules, the same attribute is present in 310 + # previous gnuradio versions where there it's log4cpp. 311 + logLib = spdlog; 310 312 } // lib.optionalAttrs (hasFeature "gr-uhd") { 311 313 inherit uhd; 312 314 } // lib.optionalAttrs (hasFeature "gr-pdu") {
+1 -1
pkgs/applications/radio/gqrx/default.nix
··· 43 43 wrapGAppsHook 44 44 ]; 45 45 buildInputs = [ 46 - gnuradio3_8Minimal.unwrapped.log4cpp 46 + gnuradio3_8Minimal.unwrapped.logLib 47 47 mpir 48 48 fftwFloat 49 49 alsa-lib
+1 -1
pkgs/applications/radio/qradiolink/default.nix
··· 49 49 buildInputs = [ 50 50 gnuradio3_8.unwrapped.boost 51 51 codec2 52 - gnuradio3_8.unwrapped.log4cpp 52 + gnuradio3_8.unwrapped.logLib 53 53 gmp 54 54 libpulseaudio 55 55 libconfig
+2 -2
pkgs/development/gnuradio-modules/ais/default.nix
··· 6 6 , python 7 7 , boost 8 8 , cppunit 9 - , log4cpp 9 + , logLib 10 10 , osmosdr 11 11 , gmp 12 12 , mpir ··· 41 41 cppunit 42 42 osmosdr 43 43 boost 44 - log4cpp 44 + logLib 45 45 gmp 46 46 mpir 47 47 fftwFloat
+2 -2
pkgs/development/gnuradio-modules/grnet/default.nix
··· 6 6 , cmake 7 7 , pkg-config 8 8 , boost 9 - , log4cpp 9 + , logLib 10 10 , python 11 11 , swig 12 12 , mpir ··· 67 67 68 68 buildInputs = [ 69 69 boost 70 - log4cpp 70 + logLib 71 71 doxygen 72 72 mpir 73 73 gmp
+2 -2
pkgs/development/gnuradio-modules/gsm/default.nix
··· 6 6 , cppunit 7 7 , swig 8 8 , boost 9 - , log4cpp 9 + , logLib 10 10 , python 11 11 , libosmocore 12 12 , osmosdr ··· 32 32 33 33 buildInputs = [ 34 34 cppunit 35 - log4cpp 35 + logLib 36 36 boost 37 37 libosmocore 38 38 osmosdr
+2 -2
pkgs/development/gnuradio-modules/limesdr/default.nix
··· 8 8 , doxygen 9 9 , swig 10 10 , python 11 - , log4cpp 11 + , logLib 12 12 , mpir 13 13 , boost 14 14 , gmp ··· 42 42 python 43 43 ]; 44 44 buildInputs = [ 45 - log4cpp 45 + logLib 46 46 mpir 47 47 boost 48 48 gmp
+2 -2
pkgs/development/gnuradio-modules/nacl/default.nix
··· 6 6 , cppunit 7 7 , swig 8 8 , boost 9 - , log4cpp 9 + , logLib 10 10 , python 11 11 , libsodium 12 12 }: ··· 31 31 32 32 buildInputs = [ 33 33 cppunit 34 - log4cpp 34 + logLib 35 35 boost 36 36 libsodium 37 37 ];
+2 -2
pkgs/development/gnuradio-modules/osmosdr/default.nix
··· 6 6 , gnuradio 7 7 , cmake 8 8 , pkg-config 9 - , log4cpp 9 + , logLib 10 10 , mpir 11 11 , boost 12 12 , gmp ··· 44 44 outputs = [ "out" "dev" ]; 45 45 46 46 buildInputs = [ 47 - log4cpp 47 + logLib 48 48 mpir 49 49 boost 50 50 fftwFloat
+2 -2
pkgs/development/gnuradio-modules/rds/default.nix
··· 6 6 , pkg-config 7 7 , swig 8 8 , python 9 - , log4cpp 9 + , logLib 10 10 , mpir 11 11 , thrift 12 12 , boost ··· 36 36 disabledForGRafter = "3.9"; 37 37 38 38 buildInputs = [ 39 - log4cpp 39 + logLib 40 40 mpir 41 41 boost 42 42 gmp
+2 -5
pkgs/top-level/gnuradio-packages.nix
··· 19 19 # Packages that are potentially overridden and used as deps here. 20 20 boost 21 21 volk 22 + logLib 22 23 ; 23 24 inherit mkDerivationWith mkDerivation; 24 25 } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { 25 26 inherit (gnuradio) uhd; 26 - } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { 27 - inherit (gnuradio) spdlog; 28 - } else { 29 - inherit (gnuradio) log4cpp; 30 - })); 27 + }); 31 28 in { 32 29 33 30 inherit callPackage mkDerivation mkDerivationWith;