diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index 07a353daa447..18b8229cebcc 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -7,6 +7,7 @@ , cmake , pkg-config , 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,12 +37,14 @@ 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" ]; @@ -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