diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-10-06 02:27:00 +0300 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2020-12-05 13:23:00 +0200 |
commit | ed44b466e6119901d8e69b39647a15692ffa7cb1 (patch) | |
tree | dd545984772cda52108c4df9b63c6873c1ae3251 /pkgs/applications/radio | |
parent | 3becac02f894b4f29ade13318b9297d827d84525 (diff) | |
download | nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar.gz nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar.bz2 nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar.lz nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar.xz nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.tar.zst nixpkgs-ed44b466e6119901d8e69b39647a15692ffa7cb1.zip |
treewide/(gnuradio plugins): Add log4cpp as it's needed now.
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.
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r-- | pkgs/applications/radio/gnuradio/gsm.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/radio/gnuradio/limesdr.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/radio/gnuradio/nacl.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/radio/gnuradio/osmosdr.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/radio/gnuradio/rds.nix | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index e0b8d7dd44f..4e2406fc07a 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -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 = '' diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 490caaaa7be..b2f99164bec 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -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 ]; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index e3d851e2e14..3435d5cdb4f 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -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 = '' diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index ad54fc8d7c4..9eb6fe648d0 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -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 diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 1f8ed211ef2..72838569bb3 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -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 = '' |