Merge pull request #226300 from bjornfor/enable-gr-osmosdr-for-gr310
gnuradioPackages.osmosdr: enable for gnuradio 3.10
This commit is contained in:
commit
ed3ec664a5
|
@ -60,13 +60,10 @@ gnuradio.pkgs.mkDerivation rec {
|
|||
pugixml
|
||||
protobuf
|
||||
gnuradio.unwrapped.boost
|
||||
gnuradio.unwrapped.logLib
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
|
||||
gnuradio.unwrapped.uhd
|
||||
] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [
|
||||
gnuradio.unwrapped.spdlog
|
||||
] else [
|
||||
gnuradio.unwrapped.log4cpp
|
||||
]) ++ lib.optionals (enableRawUdp) [
|
||||
] ++ lib.optionals (enableRawUdp) [
|
||||
libpcap
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
|
|
|
@ -225,7 +225,7 @@ let
|
|||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
|
@ -253,8 +253,10 @@ stdenv.mkDerivation rec {
|
|||
inherit
|
||||
boost
|
||||
volk
|
||||
log4cpp
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# gnuradio3.10 where there it's spdlog.
|
||||
logLib = log4cpp;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# Remove gcc and python references
|
||||
, removeReferencesTo
|
||||
|
@ -141,6 +140,9 @@ let
|
|||
};
|
||||
gr-blocks = {
|
||||
cmakeEnableFlag = "GR_BLOCKS";
|
||||
runtime = [
|
||||
libsndfile
|
||||
];
|
||||
};
|
||||
gr-fec = {
|
||||
cmakeEnableFlag = "GR_FEC";
|
||||
|
@ -259,7 +261,7 @@ let
|
|||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
|
@ -283,8 +285,10 @@ stdenv.mkDerivation rec {
|
|||
inherit
|
||||
boost
|
||||
volk
|
||||
log4cpp
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# gnuradio3.10 where there it's spdlog.
|
||||
logLib = log4cpp;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# Remove gcc and python references
|
||||
, removeReferencesTo
|
||||
|
@ -143,6 +142,10 @@ let
|
|||
};
|
||||
gr-blocks = {
|
||||
cmakeEnableFlag = "GR_BLOCKS";
|
||||
runtime = [
|
||||
# Required to compile wavfile blocks.
|
||||
libsndfile
|
||||
];
|
||||
};
|
||||
gr-fec = {
|
||||
cmakeEnableFlag = "GR_FEC";
|
||||
|
@ -278,7 +281,7 @@ let
|
|||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
|
@ -302,8 +305,10 @@ stdenv.mkDerivation rec {
|
|||
inherit
|
||||
boost
|
||||
volk
|
||||
spdlog
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# previous gnuradio versions where there it's log4cpp.
|
||||
logLib = spdlog;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-pdu") {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, qtbase
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
, gnuradio3_8Minimal
|
||||
, gnuradioMinimal
|
||||
, thrift
|
||||
, mpir
|
||||
, fftwFloat
|
||||
|
@ -25,7 +25,7 @@ assert portaudioSupport -> portaudio != null;
|
|||
# audio backends are mutually exclusive
|
||||
assert !(pulseaudioSupport && portaudioSupport);
|
||||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
gnuradioMinimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.15.10";
|
||||
|
||||
|
@ -43,21 +43,21 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
|||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
gnuradio3_8Minimal.unwrapped.log4cpp
|
||||
gnuradioMinimal.unwrapped.logLib
|
||||
mpir
|
||||
fftwFloat
|
||||
alsa-lib
|
||||
libjack2
|
||||
gnuradio3_8Minimal.unwrapped.boost
|
||||
gnuradioMinimal.unwrapped.boost
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwayland
|
||||
gnuradio3_8Minimal.pkgs.osmosdr
|
||||
gnuradioMinimal.pkgs.osmosdr
|
||||
rtl-sdr
|
||||
hackrf
|
||||
] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
|
||||
] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
|
||||
gnuradioMinimal.unwrapped.python.pkgs.thrift
|
||||
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals portaudioSupport [ portaudio ];
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gnuradio3_8.unwrapped.boost
|
||||
codec2
|
||||
gnuradio3_8.unwrapped.log4cpp
|
||||
gnuradio3_8.unwrapped.logLib
|
||||
gmp
|
||||
libpulseaudio
|
||||
libconfig
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, python
|
||||
, boost
|
||||
, cppunit
|
||||
, log4cpp
|
||||
, logLib
|
||||
, osmosdr
|
||||
, gmp
|
||||
, mpir
|
||||
|
@ -41,7 +41,7 @@ mkDerivation rec {
|
|||
cppunit
|
||||
osmosdr
|
||||
boost
|
||||
log4cpp
|
||||
logLib
|
||||
gmp
|
||||
mpir
|
||||
fftwFloat
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, cmake
|
||||
, pkg-config
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, swig
|
||||
, mpir
|
||||
|
@ -67,7 +67,7 @@ mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
boost
|
||||
log4cpp
|
||||
logLib
|
||||
doxygen
|
||||
mpir
|
||||
gmp
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, cppunit
|
||||
, swig
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, libosmocore
|
||||
, osmosdr
|
||||
|
@ -32,7 +32,7 @@ mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
cppunit
|
||||
log4cpp
|
||||
logLib
|
||||
boost
|
||||
libosmocore
|
||||
osmosdr
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
, doxygen
|
||||
, swig
|
||||
, python
|
||||
, log4cpp
|
||||
, logLib
|
||||
, mpir
|
||||
, boost
|
||||
, gmp
|
||||
|
@ -42,7 +42,7 @@ in mkDerivation {
|
|||
python
|
||||
];
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
gmp
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, cppunit
|
||||
, swig
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, libsodium
|
||||
}:
|
||||
|
@ -31,7 +31,7 @@ mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
cppunit
|
||||
log4cpp
|
||||
logLib
|
||||
boost
|
||||
libsodium
|
||||
];
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
, gnuradio
|
||||
, cmake
|
||||
, pkg-config
|
||||
, log4cpp
|
||||
, logLib
|
||||
, libsndfile
|
||||
, mpir
|
||||
, boost
|
||||
, gmp
|
||||
|
@ -27,6 +28,8 @@ let
|
|||
version = {
|
||||
"3.7" = "0.1.5";
|
||||
"3.8" = "0.2.3";
|
||||
"3.9" = "0.2.4";
|
||||
"3.10" = "0.2.4";
|
||||
}.${gnuradio.versionAttr.major};
|
||||
src = fetchgit {
|
||||
url = "git://git.osmocom.org/gr-osmosdr";
|
||||
|
@ -34,17 +37,19 @@ let
|
|||
sha256 = {
|
||||
"3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
|
||||
"3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo=";
|
||||
"3.9" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI=";
|
||||
"3.10" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI=";
|
||||
}.${gnuradio.versionAttr.major};
|
||||
};
|
||||
in mkDerivation {
|
||||
pname = "gr-osmosdr";
|
||||
inherit version src;
|
||||
disabledForGRafter = "3.9";
|
||||
disabledForGRafter = "3.11";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
fftwFloat
|
||||
|
@ -55,11 +60,16 @@ in mkDerivation {
|
|||
libbladeRF
|
||||
rtl-sdr
|
||||
soapysdr-with-plugins
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-blocks") [
|
||||
libsndfile
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
|
||||
uhd
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
python.pkgs.thrift
|
||||
] ++ lib.optionals (gnuradio.hasFeature "python-support") [
|
||||
python.pkgs.numpy
|
||||
python.pkgs.pybind11
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, pkg-config
|
||||
, swig
|
||||
, python
|
||||
, log4cpp
|
||||
, logLib
|
||||
, mpir
|
||||
, thrift
|
||||
, boost
|
||||
|
@ -36,7 +36,7 @@ in mkDerivation {
|
|||
disabledForGRafter = "3.9";
|
||||
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
gmp
|
||||
|
|
|
@ -19,15 +19,12 @@ let
|
|||
# Packages that are potentially overridden and used as deps here.
|
||||
boost
|
||||
volk
|
||||
logLib
|
||||
;
|
||||
inherit mkDerivationWith mkDerivation;
|
||||
} // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") {
|
||||
inherit (gnuradio) uhd;
|
||||
} // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then {
|
||||
inherit (gnuradio) spdlog;
|
||||
} else {
|
||||
inherit (gnuradio) log4cpp;
|
||||
}));
|
||||
});
|
||||
in {
|
||||
|
||||
inherit callPackage mkDerivation mkDerivationWith;
|
||||
|
|
Loading…
Reference in a new issue