public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnuradio: use qwt6_qt4 instead of qwt5

Browse Source
This commit is contained in:
Luke Adams 2017-07-14 18:24:07 -05:00
parent ba49dfb318
commit b9c426c5a6
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/gnuradio/default.nix
View File

@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11"
''; '';
# Framework path needed for qwt6_qt4 but not qwt5
cmakeFlags =
stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_FRAMEWORK_PATH=${qwt}/lib" ];
# - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_*
# programs will not display anything. Yes, $MATPLOTLIBRC must point to the # programs will not display anything. Yes, $MATPLOTLIBRC must point to the
# *dirname* where matplotlibrc is located, not the file itself. # *dirname* where matplotlibrc is located, not the file itself.

1
pkgs/top-level/all-packages.nix
View File

@ -14649,6 +14649,7 @@ with pkgs;
gnuradio = callPackage ../applications/misc/gnuradio { gnuradio = callPackage ../applications/misc/gnuradio {
inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
fftw = fftwFloat; fftw = fftwFloat;
qwt = qwt6_qt4;
}; };
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {