From b9c426c5a6748a5b6a994c7680c31f1f124839a7 Mon Sep 17 00:00:00 2001 From: Luke Adams <luke.adams@belljar.io> Date: Fri, 14 Jul 2017 18:24:07 -0500 Subject: [PATCH] gnuradio: use qwt6_qt4 instead of qwt5 --- pkgs/applications/misc/gnuradio/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 338763d980e2..71b61391535a 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { 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_* # programs will not display anything. Yes, $MATPLOTLIBRC must point to the # *dirname* where matplotlibrc is located, not the file itself. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53b0e1b135c7..4cc99bd65d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14649,6 +14649,7 @@ with pkgs; gnuradio = callPackage ../applications/misc/gnuradio { inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; fftw = fftwFloat; + qwt = qwt6_qt4; }; gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {