cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gnuradio: rename wrap option to doWrap

Browse source 
Prevents naming conflict, see NixOS#121563
This commit is contained in:
Austin Butler 2021-05-13 20:53:35 -07:00
parent 37bdc088ef
commit 4b349864ca
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/radio/gnuradio/wrapper.nix
View file

@ -4,7 +4,7 @@
, unwrapped
# If it's a minimal build, we don't want to wrap it with lndir and
# wrapProgram..
, wrap ? true
, doWrap ? true
# For the wrapper
, makeWrapper
# For lndir
@ -138,7 +138,7 @@ let
;
pkgs = packages;
};
self = if wrap then
self = if doWrap then
stdenv.mkDerivation {
inherit name passthru;
buildInputs = [

6
pkgs/top-level/all-packages.nix
View file

@ -23022,7 +23022,7 @@ in
# A build without gui components and other utilites not needed for end user
# libraries
gnuradioMinimal = gnuradio.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio.unwrapped.override {
volk = volk.override {
# So it will not reference python
@ -23052,7 +23052,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_8Minimal = gnuradio3_8.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_8.unwrapped.override {
volk = volk.override {
enableModTool = false;
@ -23081,7 +23081,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_7Minimal = gnuradio3_7.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_7.unwrapped.override {
volk = volk.override {
enableModTool = false;