Commit 47625767 authored by Doron Behar's avatar Doron Behar
Browse files

gnuradio3_8: fix build by using qwt6_1

parent 1af589bc

pkgs/applications/radio/gnuradio/3.8.nix

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ let 
      cmakeEnableFlag = "GR_CHANNELS";

    };

    gr-qtgui = {

      runtime = [ qt5.qtbase libsForQt5.qwt ];

      runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];

      pythonRuntime = [ python.pkgs.pyqt5 ];

      cmakeEnableFlag = "GR_QTGUI";

    };
@@ -268,7 +268,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { 
  } // lib.optionalAttrs (hasFeature "gr-uhd") {

    inherit uhd;

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

    inherit (libsForQt5) qwt;

    qwt = libsForQt5.qwt6_1;

  };

  cmakeFlags = shared.cmakeFlags

    # From some reason, if these are not set, libcodec2 and gsm are not

pkgs/top-level/gnuradio-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ let 
      volk

      logLib

      python

      qwt

    ;

    inherit mkDerivationWith mkDerivation;

    inherit gnuradio;