alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

gnuradio: 3.7.11.1 -> 3.7.13.3

Browse source 
* also add mako input (cheetah will be removed in GR3.8)
This commit is contained in:
Luke Adams 2018-06-03 14:48:25 -05:00
parent 691596086f
commit b64932fabe
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/gnuradio/default.nix
View file

@ -6,7 +6,7 @@
# May be able to upgrade to swig3 # May be able to upgrade to swig3
, python, swig2, numpy, scipy, matplotlib , python, swig2, numpy, scipy, matplotlib
# => grc - the gnu radio companion # => grc - the gnu radio companion
, cheetah, pygtk , Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8
# => gr-wavelet: collection of wavelet blocks # => gr-wavelet: collection of wavelet blocks
, gsl , gsl
# => gr-qtgui: the Qt-based GUI # => gr-qtgui: the Qt-based GUI
@ -26,13 +26,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnuradio-${version}"; name = "gnuradio-${version}";
version = "3.7.11.1"; version = "3.7.13.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnuradio"; owner = "gnuradio";
repo = "gnuradio"; repo = "gnuradio";
rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; rev = "v${version}";
sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -69,6 +69,8 @@ stdenv.mkDerivation rec {
setupHook = [ grcSetupHook ]; setupHook = [ grcSetupHook ];
# patch wxgui and pygtk check due to python importerror in a headless environment # patch wxgui and pygtk check due to python importerror in a headless environment
# wxgtk gui will be removed in GR3.8
# c++11 hack may not be necessary anymore
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}"
sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt

2
pkgs/top-level/all-packages.nix
View file

@ -15928,7 +15928,7 @@ with pkgs;
gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
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 Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
fftw = fftwFloat; fftw = fftwFloat;
qwt = qwt6_qt4; qwt = qwt6_qt4;