public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118347 from eduardosm/gr3.8

Browse Source 
gnuradio3_8: 3.8.2.0 -> 3.8.3.0
This commit is contained in:
Robert Scott 2021-04-04 17:51:39 +01:00 committed by GitHub
commit ee33b8b17c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -42,7 +42,7 @@
, pname ? "gnuradio" , pname ? "gnuradio"
, versionAttr ? { , versionAttr ? {
major = "3.8"; major = "3.8";
minor = "2"; minor = "3";
patch = "0"; patch = "0";
} }
# We use our build of volk and not the one bundled with the release # We use our build of volk and not the one bundled with the release
@ -50,7 +50,7 @@
}: }:
let let
sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA="; sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd";
featuresInfo = { featuresInfo = {
# Needed always # Needed always
basic = { basic = {
@ -241,12 +241,17 @@ stdenv.mkDerivation rec {
}; };
cmakeFlags = shared.cmakeFlags cmakeFlags = shared.cmakeFlags
# From some reason, if these are not set, libcodec2 and gsm are not # From some reason, if these are not set, libcodec2 and gsm are not
# detected properly. NOTE: qradiolink needs libcodec2 to be detected in # detected properly. The issue is reported upstream:
# https://github.com/gnuradio/gnuradio/issues/4278
#
# NOTE: qradiolink needs libcodec2 to be detected in
# order to build, see https://github.com/qradiolink/qradiolink/issues/67 # order to build, see https://github.com/qradiolink/qradiolink/issues/67
++ lib.optionals (hasFeature "gr-vocoder" features) [ ++ lib.optionals (hasFeature "gr-vocoder" features) [
"-DLIBCODEC2_FOUND=TRUE"
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
"-DLIBCODEC2_HAS_FREEDV_API=ON" "-DLIBCODEC2_HAS_FREEDV_API=ON"
"-DLIBGSM_FOUND=TRUE"
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
] ]
@ -262,23 +267,4 @@ stdenv.mkDerivation rec {
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
'' ''
; ;
patches = [
# Don't install python referencing files if python support is disabled.
# See: https://github.com/gnuradio/gnuradio/pull/3839
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff";
sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q=";
})
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff";
sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4=";
})
# Needed to use boost 1.7x, see:
# https://github.com/gnuradio/gnuradio/issues/3720
# https://github.com/gnuradio/gnuradio/pull/3967
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff";
sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v";
})
];
} }