Commit 2634268f authored by Doron Behar's avatar Doron Behar
Browse files

gnuradio: Define a common logLib attribute 

Use it in all gnuradio modules.
parent 1dd64003

pkgs/applications/radio/gnss-sdr/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -60,13 +60,10 @@ gnuradio.pkgs.mkDerivation rec { 
    pugixml

    protobuf

    gnuradio.unwrapped.boost

    gnuradio.unwrapped.logLib

  ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [

    gnuradio.unwrapped.uhd

  ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [

    gnuradio.unwrapped.spdlog

  ] else [

    gnuradio.unwrapped.log4cpp

  ]) ++ lib.optionals (enableRawUdp) [

  ] ++ lib.optionals (enableRawUdp) [

    libpcap

  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [

    thrift

pkgs/applications/radio/gnuradio/3.8.nix

+3 −1
Original line number Diff line number Diff line
@@ -253,8 +253,10 @@ stdenv.mkDerivation { 
    inherit

      boost

      volk

      log4cpp

    ;

    # Used by many gnuradio modules, the same attribute is present in

    # gnuradio3.10 where there it's spdlog.

    logLib = log4cpp;

  } // lib.optionalAttrs (hasFeature "gr-uhd") {

    inherit uhd;

  } // lib.optionalAttrs (hasFeature "gr-qtgui") {

pkgs/applications/radio/gnuradio/3.9.nix

+3 −1
Original line number Diff line number Diff line
@@ -285,8 +285,10 @@ stdenv.mkDerivation { 
    inherit

      boost

      volk

      log4cpp

    ;

    # Used by many gnuradio modules, the same attribute is present in

    # gnuradio3.10 where there it's spdlog.

    logLib = log4cpp;

  } // lib.optionalAttrs (hasFeature "gr-uhd") {

    inherit uhd;

  } // lib.optionalAttrs (hasFeature "gr-qtgui") {

pkgs/applications/radio/gnuradio/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -305,8 +305,10 @@ stdenv.mkDerivation { 
    inherit

      boost

      volk

      spdlog

    ;

    # 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") {

pkgs/applications/radio/gqrx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { 
    wrapGAppsHook

  ];

  buildInputs = [

    gnuradio3_8Minimal.unwrapped.log4cpp

    gnuradio3_8Minimal.unwrapped.logLib

    mpir

    fftwFloat

    alsa-lib