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

Merge pull request #128614 from NixOS/backport-128492-to-release-21.05

Browse Source 
[Backport release-21.05] gnuradio: 3.9.1.0 -> 3.9.2.0
This commit is contained in:
Artturi 2021-08-07 00:20:31 +03:00 committed by GitHub
commit e2a629767a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/radio/gnuradio/default.nix
View File

@ -22,6 +22,7 @@
, uhd , uhd
, SDL , SDL
, gsl , gsl
, soapysdr
, libsodium , libsodium
, libsndfile , libsndfile
, libunwind , libunwind
@ -44,14 +45,14 @@
, pname ? "gnuradio" , pname ? "gnuradio"
, versionAttr ? { , versionAttr ? {
major = "3.9"; major = "3.9";
minor = "1"; minor = "2";
patch = "0"; patch = "0";
} }
, fetchSubmodules ? false , fetchSubmodules ? false
}: }:
let let
sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq";
featuresInfo = { featuresInfo = {
# Needed always # Needed always
basic = { basic = {
@ -205,6 +206,12 @@ let
gr-network = { gr-network = {
cmakeEnableFlag = "GR_NETWORK"; cmakeEnableFlag = "GR_NETWORK";
}; };
gr-soapy = {
cmakeEnableFlag = "GR_SOAPY";
runtime = [
soapysdr
];
};
}; };
shared = (import ./shared.nix { shared = (import ./shared.nix {
inherit inherit
@ -233,6 +240,7 @@ stdenv.mkDerivation rec {
src src
nativeBuildInputs nativeBuildInputs
buildInputs buildInputs
cmakeFlags
disallowedReferences disallowedReferences
stripDebugList stripDebugList
doCheck doCheck
@ -248,25 +256,9 @@ stdenv.mkDerivation rec {
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) { } // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
inherit (libsForQt5) qwt; 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"
]
;
postInstall = shared.postInstall postInstall = shared.postInstall
# This is the only python reference worth removing, if needed. # This is the only python reference worth removing, if needed.
# Even if python support is enabled, and we don't care about this
# reference, pybind's path is not properly set. See:
# https://github.com/gnuradio/gnuradio/issues/4380
+ lib.optionalString (!hasFeature "python-support" features) '' + lib.optionalString (!hasFeature "python-support" features) ''
${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
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)