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

treewide/(gnuradio plugins): Add log4cpp as it's needed now.

Browse Source 
Since gnuradio-runtime is compiled with log4cpp, all plugins that need
gnuradio-runtime (which is all of them probably) need log4cpp as well.

Add python.pkgs.cheetah to inputs of gr-osmosdr as it somehow started to
be needed.
This commit is contained in:
Doron Behar 2020-10-06 02:27:00 +03:00
parent 3becac02f8
commit ed44b466e6
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/radio/gnuradio/gsm.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp
, makeWrapper, cppunit, libosmocore, gr-osmosdr
, pythonSupport ? true, python, swig
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr
cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''

4
pkgs/applications/radio/gnuradio/limesdr.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
, pythonSupport ? true, python, swig, limesuite
, pythonSupport ? true, python, swig, limesuite, log4cpp
} :
assert pythonSupport -> python != null && swig != null;
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
] ++ stdenv.lib.optionals pythonSupport [ swig ];
buildInputs = [
boost gnuradio limesuite
boost gnuradio limesuite log4cpp
] ++ stdenv.lib.optionals pythonSupport [ python ];

4
pkgs/applications/radio/gnuradio/nacl.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd
, makeWrapper, libsodium, cppunit
, makeWrapper, libsodium, cppunit, log4cpp
, pythonSupport ? true, python, swig
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake boost gnuradio uhd makeWrapper libsodium cppunit
cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''

5
pkgs/applications/radio/gnuradio/osmosdr.nix
View File

@ -8,6 +8,7 @@
, rtl-sdr
, soapysdr-with-plugins
, uhd
, log4cpp
}:
assert pythonSupport -> python != null && swig != null;
@ -24,10 +25,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake makeWrapper boost
cmake makeWrapper boost log4cpp
airspy gnuradio hackrf libbladeRF rtl-sdr uhd
] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ]
++ stdenv.lib.optionals pythonSupport [ python swig ];
++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ];
postInstall = ''
for prog in "$out"/bin/*; do

4
pkgs/applications/radio/gnuradio/rds.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp
, makeWrapper, pythonSupport ? true, python, swig
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake boost gnuradio makeWrapper
cmake boost gnuradio makeWrapper log4cpp
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''

1
pkgs/top-level/all-packages.nix
View File

@ -21277,6 +21277,7 @@ in
# Use the same gnuradio for gr-osmosdr as well
gr-osmosdr = gr-osmosdr.override {
gnuradio = gnuradio3_7Minimal;
pythonSupport = false;
};
};