diff options
| author | Doron Behar <doron.behar@gmail.com> | 2021-03-13 13:50:15 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2021-03-13 19:07:20 +0200 |
| commit | 650ee258fde069a1ac3544cdce89029e9f91d5c5 (patch) | |
| tree | 984879a1647d9eb64dfc66ad9b22f2ea5d4a1f96 /pkgs/development/gnuradio-modules | |
| parent | 7df0fa108a76aeb892db5e0499aa9e57b61b6a2b (diff) | |
| download | nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar.gz nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar.bz2 nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar.lz nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar.xz nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.tar.zst nixpkgs-650ee258fde069a1ac3544cdce89029e9f91d5c5.zip | |
gnuradio3_{7,8}: Use external volk
Now that volk is packaged, we can use our build and save some closure space for those that have more then 1 version of gnuradio installed. Also, simplify a bit how attributes are inherited in the expression.
Diffstat (limited to 'pkgs/development/gnuradio-modules')
| -rw-r--r-- | pkgs/development/gnuradio-modules/mkDerivation.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/gnuradio-modules/mkDerivation.nix b/pkgs/development/gnuradio-modules/mkDerivation.nix index 235eff25cdb..014968f82cc 100644 --- a/pkgs/development/gnuradio-modules/mkDerivation.nix +++ b/pkgs/development/gnuradio-modules/mkDerivation.nix @@ -17,7 +17,9 @@ let args_ = { enableParallelBuilding = args.enableParallelBuilding or true; nativeBuildInputs = (args.nativeBuildInputs or []); - # We add gnuradio itself by default - buildInputs = (args.buildInputs or []) ++ [ unwrapped ]; + # We add gnuradio and volk itself by default - most gnuradio based packages + # will not consider it a depenency worth mentioning and it will almost + # always be needed + buildInputs = (args.buildInputs or []) ++ [ unwrapped unwrapped.volk ]; }; in mkDerivation (args // args_) |