diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:25 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:25 +0000 |
| commit | 73b2c285fec9878d6e07b7ec4ad1aae742203912 (patch) | |
| tree | 8947504bdde948175773e393cbf563df892ba856 | |
| parent | 3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b (diff) | |
| download | nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.gz nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.bz2 nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.lz nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.xz nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.zst nixpkgs-73b2c285fec9878d6e07b7ec4ad1aae742203912.zip | |
radare2, r2-for-cutter: move defaults to package file
| -rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a72ef7937c5..68931773f04 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -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); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec7012ac691..c229a8cb267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |