@@ -42,7 +42,7 @@
4242, pname ? "gnuradio"
4343, versionAttr ? {
4444 major = "3.8";
45− minor = "2";
45+ minor = "3";
4646 patch = "0";
4747}
4848# We use our build of volk and not the one bundled with the release
@@ -50,7 +50,7 @@
5050}:
5151
5252let
53− sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA=";
53+ sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd";
5454 featuresInfo = {
5555 # Needed always
5656 basic = {
@@ -241,12 +241,17 @@ stdenv.mkDerivation rec {
241241 };
242242 cmakeFlags = shared.cmakeFlags
243243 # From some reason, if these are not set, libcodec2 and gsm are not
244− # detected properly. NOTE: qradiolink needs libcodec2 to be detected in
244+ # detected properly. The issue is reported upstream:
245+ # https://github.com/gnuradio/gnuradio/issues/4278
246+ #
247+ # NOTE: qradiolink needs libcodec2 to be detected in
245248 # order to build, see https://github.com/qradiolink/qradiolink/issues/67
246249 ++ lib.optionals (hasFeature "gr-vocoder" features) [
250+ "-DLIBCODEC2_FOUND=TRUE"
247251 "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
248252 "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
249253 "-DLIBCODEC2_HAS_FREEDV_API=ON"
254+ "-DLIBGSM_FOUND=TRUE"
250255 "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
251256 "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
252257 ]
@@ -262,23 +267,4 @@ stdenv.mkDerivation rec {
262267 ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
263268 ''
264269 ;
265− patches = [
266− # Don't install python referencing files if python support is disabled.
267− # See: https://github.com/gnuradio/gnuradio/pull/3839
268− (fetchpatch {
269− url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff";
270− sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q=";
271− })
272− (fetchpatch {
273− url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff";
274− sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4=";
275− })
276− # Needed to use boost 1.7x, see:
277− # https://github.com/gnuradio/gnuradio/issues/3720
278− # https://github.com/gnuradio/gnuradio/pull/3967
279− (fetchpatch {
280− url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff";
281− sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v";
282− })
283− ];
284270}