From 73b2c285fec9878d6e07b7ec4ad1aae742203912 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 3 Feb 2019 15:33:25 +0000
Subject: [PATCH] radare2, r2-for-cutter: move defaults to package file
---
pkgs/development/tools/analysis/radare2/default.nix | 5 ++++-
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 { };