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