summaryrefslogtreecommitdiff
path: root/pkgs/development/gnuradio-modules
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2021-10-21 15:45:55 +0300
committerDoron Behar <doron.behar@gmail.com>2021-10-23 23:46:45 +0300
commit58025e85871f2509cb21fe06c326657f81227e84 (patch)
tree60aec143570c2c7b9e4bb21139e6e11791e6ab1e /pkgs/development/gnuradio-modules
parentgnuradio: Add missing runtime python packages (diff)
downloadnixpkgs-58025e85871f2509cb21fe06c326657f81227e84.tar.gz
gnuradio: Reenable thrift support
Apparently, this requires thrift to be added to all other reverse dependencies.
Diffstat (limited to 'pkgs/development/gnuradio-modules')
-rw-r--r--pkgs/development/gnuradio-modules/limesdr/default.nix4
-rw-r--r--pkgs/development/gnuradio-modules/osmosdr/default.nix4
-rw-r--r--pkgs/development/gnuradio-modules/rds/default.nix4
3 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix
index c10ab9df391e..f26e4695a10c 100644
--- a/pkgs/development/gnuradio-modules/limesdr/default.nix
+++ b/pkgs/development/gnuradio-modules/limesdr/default.nix
@@ -2,6 +2,7 @@
, mkDerivation
, fetchFromGitHub
, gnuradio
+, thrift
, cmake
, pkg-config
, doxygen
@@ -49,6 +50,9 @@ in mkDerivation {
gmp
icu
limesuite
+ ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+ thrift
+ python.pkgs.thrift
];
meta = with lib; {
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index de7cc8aa460b..ebb34afee101 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -8,6 +8,7 @@
, mpir
, boost
, gmp
+, thrift
, fftwFloat
, python
, swig
@@ -54,6 +55,9 @@ in mkDerivation {
soapysdr-with-plugins
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
uhd
+ ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+ thrift
+ python.pkgs.thrift
];
cmakeFlags = [
(if (gnuradio.hasFeature "python-support") then
diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix
index c068d6af8105..6e651cdd7e0c 100644
--- a/pkgs/development/gnuradio-modules/rds/default.nix
+++ b/pkgs/development/gnuradio-modules/rds/default.nix
@@ -8,6 +8,7 @@
, python
, log4cpp
, mpir
+, thrift
, boost
, gmp
, icu
@@ -40,6 +41,9 @@ in mkDerivation {
boost
gmp
icu
+ ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
+ thrift
+ python.pkgs.thrift
];
nativeBuildInputs = [