gnss-sdr: Refactor to use gnuradio.pkgs.mkDerivation

Use the same dependencies that gnuradio uses, thanks to gnuradio's
`mkDerivation`. Add `gnuradio.pkgs.osmosdr` as dependency.
This commit is contained in:
Doron Behar 2020-12-15 11:56:54 +02:00
parent 6a4744a094
commit b944ca9350
2 changed files with 19 additions and 16 deletions

@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub
{ lib
, fetchFromGitHub
, armadillo
, boost
, cmake
, gmp
, glog
, gmock
, openssl
, gflags
, gnuradio
, libpcap
, orc
, pkg-config
, pythonPackages
, uhd
, log4cpp
, blas, lapack
@ -18,7 +19,7 @@
, protobuf
}:
stdenv.mkDerivation rec {
gnuradio.pkgs.mkDerivation rec {
pname = "gnss-sdr";
version = "0.0.13";
@ -29,27 +30,32 @@ stdenv.mkDerivation rec {
sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
gnuradio.unwrapped.python
gnuradio.unwrapped.python.pkgs.Mako
gnuradio.unwrapped.python.pkgs.six
];
buildInputs = [
gmp
armadillo
boost.dev
gnuradio.unwrapped.boost
glog
gmock
openssl.dev
openssl
gflags
gnuradio
orc
pythonPackages.Mako
pythonPackages.six
# UHD support is optional, but gnuradio is built with it, so there's
# nothing to be gained by leaving it out.
uhd
gnuradio.unwrapped.uhd
log4cpp
blas lapack
matio
pugixml
protobuf
gnuradio.pkgs.osmosdr
libpcap
];
cmakeFlags = [

@ -22325,10 +22325,7 @@ in
gksu = callPackage ../applications/misc/gksu { };
gnss-sdr = callPackage ../applications/radio/gnss-sdr {
boost = boost166;
gnuradio = gnuradio3_7.unwrapped;
};
gnss-sdr = callPackage ../applications/radio/gnss-sdr { };
gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
unwrapped = callPackage ../applications/radio/gnuradio {