diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2021-04-03 21:47:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 21:47:33 +0200 |
| commit | 577a220c1650ea8d1f0ed56c305235f92371b4fe (patch) | |
| tree | 9ced113e04583807e6d9a2c7e5f362dbed335ad8 /pkgs/applications | |
| parent | 34980b632f93f9ccb7b543cab0ade6e4938eb3a1 (diff) | |
| parent | 6242f38c3058f5a9136b357d0fa0598c18bd5cae (diff) | |
| download | nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar.gz nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar.bz2 nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar.lz nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar.xz nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.tar.zst nixpkgs-577a220c1650ea8d1f0ed56c305235f92371b4fe.zip | |
Merge pull request #118345 from eduardosm/gr3.9
gnuradio: 3.9.0.0 -> 3.9.1.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/default.nix | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index bcb2560144a..cb464bde16e 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -44,14 +44,14 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "0"; + minor = "1"; patch = "0"; } , fetchSubmodules ? false }: let - sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk="; + sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; featuresInfo = { # Needed always basic = { @@ -190,11 +190,10 @@ let runtime = [ SDL ]; cmakeEnableFlag = "GR_VIDEO_SDL"; }; - # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278 - # gr-vocoder = { - # runtime = [ codec2 gsm ]; - # cmakeEnableFlag = "GR_VOCODER"; - # }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; gr-wavelet = { cmakeEnableFlag = "GR_WAVELET"; runtime = [ gsl libsodium ]; @@ -234,7 +233,6 @@ stdenv.mkDerivation rec { src nativeBuildInputs buildInputs - cmakeFlags disallowedReferences stripDebugList doCheck @@ -250,6 +248,22 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { inherit (libsForQt5) qwt; }; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are not + # detected properly. + ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_FOUND=TRUE" + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" + "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_FOUND=TRUE" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" + ] + ++ lib.optionals (hasFeature "volk" features && volk != null) [ + "-DENABLE_INTERNAL_VOLK=OFF" + ] + ; postInstall = shared.postInstall # This is the only python reference worth removing, if needed. |