Merge pull request #148400 from NixOS/pkg/gnuradio

This commit is contained in:
Doron Behar 2021-12-03 13:35:54 +02:00 committed by GitHub
commit 16cabe2824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -46,13 +46,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.9";
minor = "3";
minor = "4";
patch = "0";
}
}:
let
sourceSha256 = "sha256-jVfExv1CcnlOaaj/XtnfhWAHnQsshZJ1l/zXo0uovdo=";
sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk=";
featuresInfo = {
# Needed always
basic = {
@ -79,6 +79,9 @@ let
native = [ doxygen ];
cmakeEnableFlag = "DOXYGEN";
};
man-pages = {
cmakeEnableFlag = "MANPAGES";
};
python-support = {
pythonRuntime = [ python.pkgs.six ];
native = [
@ -269,11 +272,6 @@ stdenv.mkDerivation rec {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.patch
(fetchpatch {
# https://github.com/gnuradio/gnuradio/pull/5225
url = "https://github.com/gnuradio/gnuradio/commit/4cef46e3ea0faf04e05ca1a5846cd1568fa51bb2.patch";
sha256 = "sha256-6AlGbtD1S0c3I9JSoLTMP4YqwDU17i2j+XRkuR+QTuc=";
})
];
passthru = shared.passthru // {
# Deps that are potentially overriden and are used inside GR plugins - the same version must