about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:25 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:25 +0000
commit73b2c285fec9878d6e07b7ec4ad1aae742203912 (patch)
tree8947504bdde948175773e393cbf563df892ba856 /pkgs/top-level
parent3a7f3a1119e795d8b9a9886e11bd15c6f2ea386b (diff)
downloadnixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.gz
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.bz2
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.lz
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.xz
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.tar.zst
nixlib-73b2c285fec9878d6e07b7ec4ad1aae742203912.zip
radare2, r2-for-cutter: move defaults to package file
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec7012ac6916..c229a8cb267d 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 { };