radare2, r2-for-cutter: move defaults to package file

This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:25 +00:00
parent 3a7f3a1119
commit 73b2c285fe
2 changed files with 6 additions and 7 deletions

View file

@ -8,7 +8,10 @@
, python3 ? null
, ruby ? null
, lua ? null
, useX11, rubyBindings, pythonBindings, luaBindings
, useX11 ? false
, rubyBindings ? false
, pythonBindings ? false
, luaBindings ? false
}:
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);

View file

@ -9007,14 +9007,10 @@ in
r10k = callPackage ../tools/system/r10k { };
inherit (callPackages ../development/tools/analysis/radare2 {
inherit (callPackages ../development/tools/analysis/radare2 ({
inherit (gnome2) vte;
lua = lua5;
useX11 = config.radare.useX11 or false;
pythonBindings = config.radare.pythonBindings or false;
rubyBindings = config.radare.rubyBindings or false;
luaBindings = config.radare.luaBindings or false;
}) radare2 r2-for-cutter;
} // (config.radare or {}))) radare2 r2-for-cutter;
radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { };