diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-10-05 12:04:49 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-12-05 13:23:00 +0200 |
| commit | 3becac02f894b4f29ade13318b9297d827d84525 (patch) | |
| tree | ba5234d532394fe260f5ed1101469df2e0fb4178 /pkgs/top-level/aliases.nix | |
| parent | 7e96d9ee61cbe72dfe72d522dbed2d0c89b500d4 (diff) | |
| download | nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar.gz nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar.bz2 nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar.lz nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar.xz nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.tar.zst nixpkgs-3becac02f894b4f29ade13318b9297d827d84525.zip | |
gnuradio: rewrite
Write (similar) expressions for GNURadio 3.7 and 3.8 and make 3.8 available as `gnuradio`, and `gnuradio3_7` point to the 3.7 build. Teach both 3.7 & 3.8 expressions accept a `features` attribute set, that tells them what features to compile. There are dependencies within the different features, and we rely on upstream's cmake scripts to make sure the `configurePhase` will fail if a feature is not enabled and needed by another feature. All features are enabled by default. Put shared Nix functions and attributes for both 3.7 and 3.8 in: pkgs/applications/radio/gnuradio/shared.nix Add 2 patches accepted upstream, that don't install some python related examples if python-support is not enabled. Remove cmake python reference in 3.8 with removeReferencesTo, if python-support is turned off. Update gqrx (reverse dependency) to use a build of gnuradio3_7 without gui components and for it's gr-osmosdr as well. Write an external, `wrapper.nix` (shared for both 3.7 and 3.8). Teach it to handle extra `gr-` packages via `GRC_BLOCKS_PATH`. Likely enable it to accept extra python packages. Wrap the executables with env vars wrapGAppsHook and wrapQtAppsHook would have likely given them (hence, fix #87510). Point `gnuradio` to the wrapped 3.8 derivation. Add @doronbehar to maintainers of both 3.8 and 3.7. dirty: use upstreamed patches
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28b5614a80c..d9ec9bdca97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -189,6 +189,10 @@ mapAliases ({ gnuradio-limesdr = gr-limesdr; # added 2019-05-27 gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 + # added 20-10-2020 + gnuradio-with-packages = gnuradio3_7.override { + extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ]; + }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 |