diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-04-15 17:33:54 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-04-21 13:11:49 +0300 |
| commit | a1fb8a399cf4248828f6f05d064dba0b0dbc80b8 (patch) | |
| tree | 1391539901cabe17fc2e27c371273041c70ced40 | |
| parent | 2634268fa65a862f44bc9353e041bbcabebd01f4 (diff) | |
| download | nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar.gz nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar.bz2 nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar.lz nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar.xz nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.tar.zst nixpkgs-a1fb8a399cf4248828f6f05d064dba0b0dbc80b8.zip | |
gnuradioPackages.osmosdr: enable for gnuradio 3.9 and 3.10
Add the latest gr-osmosdr version, 0.2.4, for use with gnuradio 3.9 and 3.10. Add new deps as needed. Closes https://github.com/NixOS/nixpkgs/issues/226296.
| -rw-r--r-- | pkgs/development/gnuradio-modules/osmosdr/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index 07a353daa44..18b8229cebc 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 |