public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118803 from SuperSandro2000/radare-cleanup

Browse Source 
Radare cleanup
This commit is contained in:
Jörg Thalheim 2021-04-08 13:45:41 +01:00 committed by GitHub
commit 8865b1a8ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -13,23 +13,18 @@
, file , file
, libzip , libzip
, xxHash , xxHash
, gtk2 ? null , gtk2
, vte ? null , vte
, gtkdialog ? null , gtkdialog
, python3 ? null , python3
, ruby ? null , ruby
, lua ? null , lua
, useX11 ? false , useX11 ? false
, rubyBindings ? false , rubyBindings ? false
, pythonBindings ? false , pythonBindings ? false
, luaBindings ? false , luaBindings ? false
}: }:
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null;
assert pythonBindings -> python3 != null;
let let
inherit (lib) optional; inherit (lib) optional;

2
pkgs/development/tools/analysis/rizin/cutter.nix
View File

@ -35,8 +35,6 @@ mkDerivation rec {
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
''; '';
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Free and Open Source Reverse Engineering Platform powered by rizin"; description = "Free and Open Source Reverse Engineering Platform powered by rizin";
homepage = src.meta.homepage; homepage = src.meta.homepage;

2
pkgs/development/tools/analysis/rizin/default.nix
View File

@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
"-Duse_sys_tree_sitter=true" "-Duse_sys_tree_sitter=true"
]; ];
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config meson ninja cmake ]; nativeBuildInputs = [ pkg-config meson ninja cmake ];
buildInputs = [ buildInputs = [

2
pkgs/top-level/aliases.nix
View File

@ -620,7 +620,7 @@ mapAliases ({
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
radare2-cutter = cutter; radare2-cutter = cutter; # added 2021-03-30
rkt = throw "rkt was archived by upstream"; # added 2020-05-16 rkt = throw "rkt was archived by upstream"; # added 2020-05-16
ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";