git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118345 from eduardosm/gr3.9

gnuradio: 3.9.0.0 -> 3.9.1.0

commit577a220c1650ea8d1f0ed56c305235f92371b4fe authorPascal Bach <pascal.bach@nextrem.ch> dateSat 3 Apr 2021, 21:47 (6 years ago) parent34980b66242f38
1 file changed+22−8
pkgs/applications/radio/gnuradio/default.nix+22−8
pkgs/applications/radio/gnuradio/default.nix+22−8
@@ -44,14 +44,14 @@
4444, pname ? "gnuradio"
4545, versionAttr ? {
4646 major = "3.9";
47− minor = "0";
47+ minor = "1";
4848 patch = "0";
4949}
5050, fetchSubmodules ? false
5151}:
5252
5353let
54− sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk=";
54+ sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp";
5555 featuresInfo = {
5656 # Needed always
5757 basic = {
@@ -190,11 +190,10 @@ let
190190 runtime = [ SDL ];
191191 cmakeEnableFlag = "GR_VIDEO_SDL";
192192 };
193− # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278
194− # gr-vocoder = {
195− # runtime = [ codec2 gsm ];
196− # cmakeEnableFlag = "GR_VOCODER";
197− # };
193+ gr-vocoder = {
194+ runtime = [ codec2 gsm ];
195+ cmakeEnableFlag = "GR_VOCODER";
196+ };
198197 gr-wavelet = {
199198 cmakeEnableFlag = "GR_WAVELET";
200199 runtime = [ gsl libsodium ];
@@ -234,7 +233,6 @@ stdenv.mkDerivation rec {
234233 src
235234 nativeBuildInputs
236235 buildInputs
237− cmakeFlags
238236 disallowedReferences
239237 stripDebugList
240238 doCheck
@@ -250,6 +248,22 @@ stdenv.mkDerivation rec {
250248 } // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
251249 inherit (libsForQt5) qwt;
252250 };
251+ cmakeFlags = shared.cmakeFlags
252+ # From some reason, if these are not set, libcodec2 and gsm are not
253+ # detected properly.
254+ ++ lib.optionals (hasFeature "gr-vocoder" features) [
255+ "-DLIBCODEC2_FOUND=TRUE"
256+ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
257+ "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
258+ "-DLIBCODEC2_HAS_FREEDV_API=ON"
259+ "-DLIBGSM_FOUND=TRUE"
260+ "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
261+ "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
262+ ]
263+ ++ lib.optionals (hasFeature "volk" features && volk != null) [
264+ "-DENABLE_INTERNAL_VOLK=OFF"
265+ ]
266+ ;
253267
254268 postInstall = shared.postInstall
255269 # This is the only python reference worth removing, if needed.