Unverified Commit ed3ec664 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #226300 from bjornfor/enable-gr-osmosdr-for-gr310 

gnuradioPackages.osmosdr: enable for gnuradio 3.10
parents 55bf31e2 cf7db74b

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

+4 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ let 
  inherit (shared) hasFeature; # function

in



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  inherit pname;

  inherit (shared)

    version
@@ -253,8 +253,10 @@ stdenv.mkDerivation rec { 
    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

+7 −3
Original line number Diff line number Diff line 
{ lib, stdenv

, fetchFromGitHub

, fetchpatch

, cmake

# Remove gcc and python references

, removeReferencesTo
@@ -141,6 +140,9 @@ let 
    };

    gr-blocks = {

      cmakeEnableFlag = "GR_BLOCKS";

      runtime = [

        libsndfile

      ];

    };

    gr-fec = {

      cmakeEnableFlag = "GR_FEC";
@@ -259,7 +261,7 @@ let 
  inherit (shared) hasFeature; # function

in



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  inherit pname;

  inherit (shared)

    version
@@ -283,8 +285,10 @@ stdenv.mkDerivation rec { 
    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

+8 −3
Original line number Diff line number Diff line 
{ lib, stdenv

, fetchFromGitHub

, fetchpatch

, cmake

# Remove gcc and python references

, removeReferencesTo
@@ -143,6 +142,10 @@ let 
    };

    gr-blocks = {

      cmakeEnableFlag = "GR_BLOCKS";

      runtime = [

        # Required to compile wavfile blocks.

        libsndfile

      ];

    };

    gr-fec = {

      cmakeEnableFlag = "GR_FEC";
@@ -278,7 +281,7 @@ let 
  inherit (shared) hasFeature; # function

in



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  inherit pname;

  inherit (shared)

    version
@@ -302,8 +305,10 @@ stdenv.mkDerivation rec { 
    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

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
, qtbase

, qtsvg

, qtwayland

, gnuradio3_8Minimal

, gnuradioMinimal

, thrift

, mpir

, fftwFloat
@@ -25,7 +25,7 @@ assert portaudioSupport -> portaudio != null; 
# audio backends are mutually exclusive

assert !(pulseaudioSupport && portaudioSupport);



gnuradio3_8Minimal.pkgs.mkDerivation rec {

gnuradioMinimal.pkgs.mkDerivation rec {

  pname = "gqrx";

  version = "2.15.10";
@@ -43,21 +43,21 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { 
    wrapGAppsHook

  ];

  buildInputs = [

    gnuradio3_8Minimal.unwrapped.log4cpp

    gnuradioMinimal.unwrapped.logLib

    mpir

    fftwFloat

    alsa-lib

    libjack2

    gnuradio3_8Minimal.unwrapped.boost

    gnuradioMinimal.unwrapped.boost

    qtbase

    qtsvg

    qtwayland

    gnuradio3_8Minimal.pkgs.osmosdr

    gnuradioMinimal.pkgs.osmosdr

    rtl-sdr

    hackrf

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

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

    thrift

    gnuradio3_8Minimal.unwrapped.python.pkgs.thrift

    gnuradioMinimal.unwrapped.python.pkgs.thrift

  ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]

    ++ lib.optionals portaudioSupport [ portaudio ];